Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McQueUsr.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McQueUsr.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McQueUsr.hbm.xml	30 Jul 2012 18:50:18 -0000	1.1
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McQueUsr.hbm.xml	25 Mar 2013 12:50:35 -0000	1.2
@@ -49,14 +49,6 @@
         column="responseFinalised"
         length="1"        
    />
-   
-   <property
-        name="viewSummaryRequested"
-        type="boolean"
-        access="property"
-        column="viewSummaryRequested"
-        length="1"        
-   />   
 
     <property
         name="mcSessionId"
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.104 -r1.105
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	16 May 2011 05:11:30 -0000	1.104
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	25 Mar 2013 12:50:35 -0000	1.105
@@ -48,10 +48,8 @@
     public static final String LIST_ALL_GROUPS_DTO = "listAllGroupsDTO";
     public static final String EXPORT_PORTFOLIO = "exportPortfolio";
     public static final String INDIVIDUAL_REPORT = "individualReport";
-    public static final String VIEW_SUMMARY = "viewSummary";
     public static final String REDO_QUESTIONS = "redoQuestions";
     public static final String SINGLE_QUESTION_ANSWERS = "singleQuestionAnswers";
-    public static final String RESULTS_SUMMARY = "resultsSummary";
     public static final String ERROR_LIST = "errorList";
     public static final String PREVIEW = "preview";
     public static final String LEARNER_PROGRESS = "learnerProgress";
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java,v
diff -u -r1.54 -r1.55
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java	17 Aug 2007 03:32:06 -0000	1.54
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java	25 Mar 2013 12:50:35 -0000	1.55
@@ -310,10 +310,8 @@
     	request.getSession().removeAttribute(LOAD_LEARNER);
     	request.getSession().removeAttribute(LOAD_MONITORING_CONTENT);
     	request.getSession().removeAttribute(INDIVIDUAL_REPORT);
-    	request.getSession().removeAttribute(VIEW_SUMMARY);
     	request.getSession().removeAttribute(REDO_QUESTIONS);
     	request.getSession().removeAttribute(SINGLE_QUESTION_ANSWERS);
-    	request.getSession().removeAttribute(RESULTS_SUMMARY);
     	request.getSession().removeAttribute(ERROR_LIST);
     	request.getSession().removeAttribute(PREVIEW);
     	request.getSession().removeAttribute(LEARNER_PROGRESS);
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20130325.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20130325.sql,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20130325.sql	25 Mar 2013 12:50:35 -0000	1.1
@@ -0,0 +1,12 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+
+----------------------Put all sql statements below here-------------------------
+
+ALTER TABLE tl_lamc11_que_usr DROP COLUMN viewSummaryRequested ;
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McQueUsr.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McQueUsr.java,v
diff -u -r1.6 -r1.7
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McQueUsr.java	15 Aug 2007 03:54:49 -0000	1.6
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McQueUsr.java	25 Mar 2013 12:50:35 -0000	1.7
@@ -52,8 +52,6 @@
     private String fullname;
     
     private boolean responseFinalised;
-    
-    private boolean viewSummaryRequested;
 
     private Long mcSessionId;
     
@@ -157,7 +155,6 @@
             .append("username", getUsername())
             .append("fullname", getFullname())
             .append("responseFinalised", isResponseFinalised())
-            .append("viewSummaryRequested", isViewSummaryRequested())
             .append("mcSessionId", getMcSessionId())
             .append("lastAttemptOrder", getLastAttemptOrder())
             .append("lastAttemptTotalMark", getLastAttemptTotalMark())
@@ -176,18 +173,6 @@
 	public void setMcSessionId(Long mcSessionId) {
 		this.mcSessionId = mcSessionId;
 	}
-    /**
-     * @return Returns the viewSummaryRequested.
-     */
-    public boolean isViewSummaryRequested() {
-        return viewSummaryRequested;
-    }
-    /**
-     * @param viewSummaryRequested The viewSummaryRequested to set.
-     */
-    public void setViewSummaryRequested(boolean viewSummaryRequested) {
-        this.viewSummaryRequested = viewSummaryRequested;
-    }
 
 	public Integer getLastAttemptOrder() {
 		return lastAttemptOrder;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java,v
diff -u -r1.71 -r1.72
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	8 Oct 2012 12:27:24 -0000	1.71
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java	25 Mar 2013 12:50:35 -0000	1.72
@@ -123,12 +123,6 @@
  />
 
  <forward
- name="resultsSummary"
- path="/learning/ResultsSummary.jsp"
- redirect="false"
- />
-
- <forward
  name="errorList"
  path="/McErrorBox.jsp"
  redirect="false"
@@ -268,11 +262,6 @@
 	    setContentInUse(request, toolContentId, mcService);
 	    mcLearningForm.setLearnerProgress(new Boolean(false).toString());
 	    return viewAnswers(mapping, mcLearningForm, request, response);
-	} else if (mcLearningForm.getViewSummary() != null) {
-	    McLearningAction.logger.debug("processing getViewSummary...");
-	    LearningUtil.saveFormRequestData(request, mcLearningForm, false);
-	    setContentInUse(request, toolContentId, mcService);
-	    return viewSummary(mapping, form, request, response);
 	} else if (mcLearningForm.getSubmitReflection() != null) {
 	    McLearningAction.logger.debug("processing getSubmitReflection...");
 	    LearningUtil.saveFormRequestData(request, mcLearningForm, false);
@@ -400,7 +389,6 @@
 	mcService.updateMcQueUsr(mcQueUsr);
 	McLearningAction.logger.debug("response finalised for user:" + mcQueUsr);
 
-	mcQueUsr.setViewSummaryRequested(true);
 	mcService.updateMcQueUsr(mcQueUsr);
 	McLearningAction.logger.debug("view summary requested by mcQueUsr: " + mcQueUsr);
 
@@ -1207,110 +1195,6 @@
     }
 
     /**
-     * 
-     * viewSummary(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
-     * 
-     * allows the learner to view all the other learners' activity summary
-     * 
-     * @param request
-     * @param form
-     * @param mapping
-     * @return ActionForward
-     */
-    public ActionForward viewSummary(ActionMapping mapping, ActionForm form, HttpServletRequest request,
-	    HttpServletResponse response) throws IOException, ServletException {
-	McLearningAction.logger.debug("dispatching viewSummary...");
-	McLearningForm mcLearningForm = (McLearningForm) form;
-	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
-	McLearningAction.logger.debug("mcService: " + mcService);
-
-	String userID = request.getParameter(AttributeNames.PARAM_USER_ID);
-	McLearningAction.logger.debug("userID: " + userID);
-
-	String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
-	McLearningAction.logger.debug("toolSessionID: " + toolSessionID);
-
-	McSession mcSession = mcService.retrieveMcSession(new Long(toolSessionID));
-	McLearningAction.logger.debug("retrieving mcSession: " + mcSession);
-
-	McQueUsr mcQueUsr = mcService.getMcUserBySession(new Long(userID), mcSession.getUid());
-	McLearningAction.logger.debug("mcQueUsr: " + mcQueUsr);
-
-	mcQueUsr.setViewSummaryRequested(true);
-	mcService.updateMcQueUsr(mcQueUsr);
-	McLearningAction.logger.debug("view summary requested by mcQueUsr: " + mcQueUsr);
-
-	String toolContentId = mcSession.getMcContent().getMcContentId().toString();
-	McLearningAction.logger.debug("toolContentId: " + toolContentId);
-
-	McContent mcContent = mcService.retrieveMc(new Long(toolContentId));
-	McLearningAction.logger.debug("mcContent: " + mcContent);
-
-	McGeneralLearnerFlowDTO mcGeneralLearnerFlowDTO = LearningUtil.buildMcGeneralLearnerFlowDTO(mcContent);
-
-	mcGeneralLearnerFlowDTO.setReflection(new Boolean(mcContent.isReflect()).toString());
-	mcGeneralLearnerFlowDTO.setNotebookEntriesVisible(new Boolean(false).toString());
-
-	int countSessionComplete = 0;
-	Iterator sessionsIterator = mcContent.getMcSessions().iterator();
-	while (sessionsIterator.hasNext()) {
-	    McSession mcSessionLocal = (McSession) sessionsIterator.next();
-	    if (mcSession != null) {
-		McLearningAction.logger.debug("mcSessionLocal: " + mcSessionLocal);
-		if (mcSessionLocal.getSessionStatus().equals(McAppConstants.COMPLETED)) {
-		    McLearningAction.logger.debug("COMPLETED session found: " + mcSessionLocal);
-		    ++countSessionComplete;
-		}
-	    }
-	}
-	McLearningAction.logger.debug("countSessionComplete: " + countSessionComplete);
-
-	Integer[] markStatistics = mcService.getMarkStatistics(mcSession);
-
-	McLearningAction.logger.debug("countSessionComplete: " + countSessionComplete);
-	McLearningAction.logger.debug("topMark: " + markStatistics[0]);
-	McLearningAction.logger.debug("lowestMark: " + markStatistics[1]);
-	McLearningAction.logger.debug("averageMark: " + markStatistics[2]);
-
-	mcGeneralLearnerFlowDTO.setCountSessionComplete(new Integer(countSessionComplete).toString());
-	mcGeneralLearnerFlowDTO.setTopMark(markStatistics[0]);
-	mcGeneralLearnerFlowDTO.setLowestMark(markStatistics[1]);
-	mcGeneralLearnerFlowDTO.setAverageMark(markStatistics[2]);
-
-	McLearningAction.logger.debug("is tool reflective: " + mcContent.isReflect());
-	mcGeneralLearnerFlowDTO.setReflection(new Boolean(mcContent.isReflect()).toString());
-	McLearningAction.logger.debug("reflection subject: " + mcContent.getReflectionSubject());
-
-	String reflectionSubject = McUtils.replaceNewLines(mcContent.getReflectionSubject());
-	mcGeneralLearnerFlowDTO.setReflectionSubject(reflectionSubject);
-
-	McLearningAction.logger.debug("mcContent.isRetries(): " + mcContent.isRetries());
-	mcGeneralLearnerFlowDTO.setRetries(new Boolean(mcContent.isRetries()).toString());
-
-	String passMarkApplicable = new Boolean(mcContent.isPassMarkApplicable()).toString();
-	mcGeneralLearnerFlowDTO.setPassMarkApplicable(passMarkApplicable);
-	mcLearningForm.setPassMarkApplicable(passMarkApplicable);
-
-	String userOverPassMark = new Boolean(mcQueUsr.isLastAttemptMarkPassed()).toString();
-	mcGeneralLearnerFlowDTO.setUserOverPassMark(userOverPassMark);
-	mcLearningForm.setUserOverPassMark(userOverPassMark);
-
-	String httpSessionID = mcLearningForm.getHttpSessionID();
-	SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(httpSessionID);
-	request.getSession().setAttribute(httpSessionID, sessionMap);
-
-	mcGeneralLearnerFlowDTO.setTotalMarksPossible(mcContent.getTotalMarksPossible());
-
-	McLearningAction.logger.debug("mcGeneralLearnerFlowDTO for jsp: " + mcGeneralLearnerFlowDTO);
-
-	request.setAttribute(McAppConstants.MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO);
-	McLearningAction.logger.debug("MC_GENERAL_LEARNER_FLOW_DTO: "
-		+ request.getAttribute(McAppConstants.MC_GENERAL_LEARNER_FLOW_DTO));
-
-	return mapping.findForward(McAppConstants.RESULTS_SUMMARY);
-    }
-
-    /**
      * setContentInUse(HttpServletRequest request, String toolContentId, IMcService mcService)
      * 
      * indicates that some learners are using the content
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java,v
diff -u -r1.28 -r1.29
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java	8 Oct 2012 12:27:24 -0000	1.28
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java	25 Mar 2013 12:50:35 -0000	1.29
@@ -39,7 +39,6 @@
     protected String nextOptions;
     protected String continueOptionsCombined;
     protected String redoQuestions;
-    protected String viewSummary;
     protected String viewAnswers;
     protected String learnerFinished;
     protected String redoQuestionsOk;
@@ -87,7 +86,6 @@
 	this.setNextOptions(null);
 	this.setContinueOptionsCombined(null);
 	this.setRedoQuestions(null);
-	this.setViewSummary(null);
 	this.setViewAnswers(null);
 	this.setRedoQuestionsOk(null);
 	this.setLearnerFinished(null);
@@ -115,21 +113,6 @@
     }
 
     /**
-     * @return Returns the viewSummary.
-     */
-    public String getViewSummary() {
-	return viewSummary;
-    }
-
-    /**
-     * @param viewSummary
-     *            The viewSummary to set.
-     */
-    public void setViewSummary(String viewSummary) {
-	this.viewSummary = viewSummary;
-    }
-
-    /**
      * @return Returns the continueOptionsCombined.
      */
     public String getContinueOptionsCombined() {
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.61 -r1.62
--- lams_tool_lamc/web/WEB-INF/struts-config.xml	30 Jul 2012 18:50:17 -0000	1.61
+++ lams_tool_lamc/web/WEB-INF/struts-config.xml	25 Mar 2013 12:50:35 -0000	1.62
@@ -274,12 +274,6 @@
 	  	/>
 
 	  	<forward
-		    name="resultsSummary"
-		    path="/learning/ResultsSummary.jsp"
-		    redirect="false"
-	  	/>
-
-	  	<forward
 		    name="errorList"
 		    path="/McErrorBox.jsp"
 		    redirect="false"
Fisheye: Tag 1.37 refers to a dead (removed) revision in file `lams_tool_lamc/web/learning/ResultsSummary.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_lamc/web/learning/mobile/ResultsSummary.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?