Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java
===================================================================
diff -u -r9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java	(.../McUtils.java)	(revision 9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java	(.../McUtils.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -181,34 +181,7 @@
 
     /**
      * 
-     * @param request
-     * @param defaultMcContent
-     * @param mcGeneralAuthoringDTO
      */
-    public static void populateAuthoringDTO(HttpServletRequest request, McContent defaultMcContent,
-	    McGeneralAuthoringDTO mcGeneralAuthoringDTO) {
-	mcGeneralAuthoringDTO.setActivityTitle(defaultMcContent.getTitle());
-	mcGeneralAuthoringDTO.setActivityInstructions(defaultMcContent.getInstructions());
-    }
-
-    /**
-     * @param request
-     * @param value
-     * @param toolContentID
-     */
-    public static void setDefineLater(HttpServletRequest request, boolean value, String strToolContentID,
-	    IMcService mcService) {
-
-	McContent mcContent = mcService.getMcContent(new Long(strToolContentID));
-	if (mcContent != null) {
-	    mcContent.setDefineLater(value);
-	    mcService.updateMc(mcContent);
-	}
-    }
-
-    /**
-     * 
-     */
     public static void setFormProperties(HttpServletRequest request, McAuthoringForm mcAuthoringForm,
 	    McGeneralAuthoringDTO mcGeneralAuthoringDTO, String strToolContentID, String httpSessionID) {
 
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcContentDAO.java
===================================================================
diff -u -r9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcContentDAO.java	(.../IMcContentDAO.java)	(revision 9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcContentDAO.java	(.../IMcContentDAO.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -81,16 +81,6 @@
 
     /**
      * <p>
-     * Delete the given instance of McContent
-     * </p>
-     * 
-     * @param mcContent
-     *            The instance of McContent to delete.
-     */
-    public void removeMc(McContent mcContent);
-
-    /**
-     * <p>
      * Delete the given instance of McContent with the given tool content id <code>mcContentId</code>
      * 
      * @param mcContentId
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcOptionsContentDAO.java
===================================================================
diff -u -r9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcOptionsContentDAO.java	(.../IMcOptionsContentDAO.java)	(revision 9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcOptionsContentDAO.java	(.../IMcOptionsContentDAO.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -33,17 +33,6 @@
  * @author Ozgur Demirtas
  */
 public interface IMcOptionsContentDAO {
-    /**
-     * *
-     * <p>
-     * Return the persistent instance of a McOptsContent with the given identifier <code>uid</code>, returns null if not
-     * found.
-     * </p>
-     * 
-     * @param uid
-     * @return McOptsContent
-     */
-    McOptsContent getMcOptionsContentByUID(Long uid);
 
     /**
      * <p>
@@ -56,55 +45,14 @@
      */
     List findMcOptionsContentByQueId(Long mcQueContentId);
 
-    /**
-     * <p>
-     * Return the persistent instance of a McOptsContent with the given identifiers <code>option</code>,
-     * <code>mcQueContentUid  </code> returns null if not found.
-     * </p>
-     * 
-     * @param option
-     * @param mcQueContentUid
-     * @return McOptsContent
-     */
-    McOptsContent getOptionContentByOptionText(final String option, final Long mcQueContentUid);
-
-    List<String> findMcOptionCorrectByQueId(Long mcQueContentId);
-
     List<McOptionDTO> getOptionDtos(Long mcQueContentId);
 
     /**
      * <p>
-     * saves McOptsContent
-     * </p>
-     * 
-     * @param mcOptionsContent
-     */
-    void saveMcOptionsContent(McOptsContent mcOptionsContent);
-
-    /**
-     * <p>
      * updates McOptsContent
      * </p>
      * 
      * @param mcOptionsContent
      */
     void updateMcOptionsContent(McOptsContent mcOptionsContent);
-
-    /**
-     * <p>
-     * removes McOptsContent
-     * </p>
-     * 
-     * @param mcOptionsContent
-     */
-    void removeMcOptionsContentByUID(Long uid);
-
-    /**
-     * <p>
-     * removes McOptsContent
-     * </p>
-     * 
-     * @param mcOptionsContent
-     */
-    void removeMcOptionsContent(McOptsContent mcOptsContent);
 }
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java
===================================================================
diff -u -r9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java	(.../IMcQueContentDAO.java)	(revision 9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java	(.../IMcQueContentDAO.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -32,32 +32,9 @@
  * @author Ozgur Demirtas
  */
 public interface IMcQueContentDAO {
-    
-    /**
-     * <p>
-     * Return the persistent instance of a McQueContent with the given identifier <code>uid</code>, returns null if not
-     * found.
-     * </p>
-     * 
-     * @param uid
-     * @return McQueContent
-     */
-    McQueContent getMcQueContentByUID(Long uid);
 
     /**
      * <p>
-     * Return the persistent instance of a McQueContent with the given identifier <code>question</code> and
-     * <code>mcContentUid</code>, returns null if not found.
-     * </p>
-     * 
-     * @param question
-     * @param mcContentUid
-     * @return McQueContent
-     */
-    McQueContent getQuestionContentByQuestionText(final String question, final Long mcContentUid);
-
-    /**
-     * <p>
      * Return the persistent instance of a McQueContent with the given identifier <code>displayOrder</code> and
      * <code>mcContentUid</code>, returns null if not found.
      * </p>
@@ -92,33 +69,6 @@
 
     /**
      * <p>
-     * resets McQueContent with the given identifier <code>mcContentUid</code>
-     * </p>
-     * 
-     * @param mcContentUid
-     */
-    void resetAllQuestions(final Long mcContentUid);
-
-    /**
-     * <p>
-     * removes McQueContent with the given identifier <code>mcContentUid</code>
-     * </p>
-     * 
-     * @param mcContentUid
-     */
-    void removeQuestionContentByMcUid(final Long mcContentUid);
-
-    /**
-     * <p>
-     * saves McQueContent with the given identifier <code>mcQueContent</code>
-     * </p>
-     * 
-     * @param mcQueContent
-     */
-    void saveMcQueContent(McQueContent mcQueContent);
-
-    /**
-     * <p>
      * updates McQueContent with the given identifier <code>mcQueContent</code>
      * </p>
      * 
@@ -137,15 +87,6 @@
 
     /**
      * <p>
-     * removes McQueContent with the given identifier <code>uid</code>
-     * </p>
-     * 
-     * @param uid
-     */
-    void removeMcQueContentByUID(Long uid);
-
-    /**
-     * <p>
      * removes McQueContent with the given identifier <code>mcQueContent</code>
      * </p>
      * 
@@ -154,16 +95,6 @@
      */
     void removeMcQueContent(McQueContent mcQueContent);
 
-    /**
-     * <p>
-     * used to get the next available display order with the given identifier <code>mcContentId</code>
-     * </p>
-     * 
-     * @param mcQueContent
-     * @return
-     */
-    List getNextAvailableDisplayOrder(final long mcContentId);
-
     McQueContent findMcQuestionContentByUid(Long uid);
 
     List getAllQuestionEntriesSorted(final long qaContentId);
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcSessionDAO.java
===================================================================
diff -u -rc369c0326857e08851d03a29d39d4337091f5253 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcSessionDAO.java	(.../IMcSessionDAO.java)	(revision c369c0326857e08851d03a29d39d4337091f5253)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcSessionDAO.java	(.../IMcSessionDAO.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -35,19 +35,6 @@
 
     /**
      * <p>
-     * Return the persistent instance of a McSession with the given identifier <code>uid</code>, returns null if not
-     * found.
-     * </p>
-     * 
-     * @param uid
-     *            an identifier for the McSession object.
-     * @return the persistent instance of a McSession or null if not found
-     */
-
-    public McSession getMcSessionByUID(Long uid);
-
-    /**
-     * <p>
      * Return the persistent instance of a McSession with the given tool session id <code>mcSessionId</code>, returns
      * null if not found.
      * </p>
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java
===================================================================
diff -u -r9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java	(.../McContentDAO.java)	(revision 9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java	(.../McContentDAO.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -90,10 +90,6 @@
 	}
     }
 
-    public void removeMc(McContent mcContent) {
-	this.getHibernateTemplate().delete(mcContent);
-    }
-
     public void removeMcSessions(McContent mcContent) {
 	this.getHibernateTemplate().deleteAll(mcContent.getMcSessions());
     }
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java
===================================================================
diff -u -r9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java	(.../McOptionsContentDAO.java)	(revision 9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java	(.../McOptionsContentDAO.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -43,12 +43,7 @@
     private static Logger logger = Logger.getLogger(McOptionsContentDAO.class.getName());
 
     private static final String FIND_OPTIONS_BY_QUESTION_UID = "from mcOptsContent in class McOptsContent where mcOptsContent.mcQueContentId=:mcQueContentUid order by mcOptsContent.displayOrder";
-    private static final String FIND_OPTIONS_BY_OPTION_TEXT = "from mcOptsContent in class McOptsContent where mcOptsContent.mcQueOptionText=:option and mcOptsContent.mcQueContentId=:mcQueContentUid";
 
-    public McOptsContent getMcOptionsContentByUID(Long uid) {
-	return (McOptsContent) this.getHibernateTemplate().get(McOptsContent.class, uid);
-    }
-
     public List<McOptsContent> findMcOptionsContentByQueId(Long questionUid) {
 	if (questionUid != null) {
 	    List<McOptsContent> list = getSession().createQuery(FIND_OPTIONS_BY_QUESTION_UID)
@@ -75,52 +70,10 @@
 	return optionDtos;
     }
 
-    public List<String> findMcOptionCorrectByQueId(Long questionUid) {
-
-	List<String> listOptionCorrect = new LinkedList<String>();
-
-	if (questionUid != null) {
-	    List<McOptsContent> options = getSession().createQuery(FIND_OPTIONS_BY_QUESTION_UID)
-		    .setLong("mcQueContentUid", questionUid.longValue()).list();
-
-	    if (options != null && options.size() > 0) {
-		for (McOptsContent option : options) {
-		    listOptionCorrect.add(new Boolean(option.isCorrectOption()).toString());
-		}
-	    }
-	}
-	return listOptionCorrect;
-    }
-
-    public McOptsContent getOptionContentByOptionText(final String option, final Long questionUid) {
-	List<McOptsContent> list = getSession().createQuery(FIND_OPTIONS_BY_OPTION_TEXT).setString("option", option)
-		.setLong("mcQueContentUid", questionUid.longValue()).list();
-
-	if (list != null && list.size() > 0) {
-	    McOptsContent mcq = (McOptsContent) list.get(0);
-	    return mcq;
-	}
-	return null;
-    }
-
-    public void saveMcOptionsContent(McOptsContent mcOptsContent) {
-	this.getHibernateTemplate().saveOrUpdate(mcOptsContent);
-    }
-
     public void updateMcOptionsContent(McOptsContent mcOptsContent) {
 	this.getHibernateTemplate().update(mcOptsContent);
     }
 
-    public void removeMcOptionsContentByUID(Long uid) {
-	McOptsContent mco = (McOptsContent) getHibernateTemplate().get(McOptsContent.class, uid);
-	this.getHibernateTemplate().delete(mco);
-    }
-
-    public void removeMcOptionsContent(McOptsContent mcOptsContent) {
-	this.getSession().setFlushMode(FlushMode.AUTO);
-	this.getHibernateTemplate().delete(mcOptsContent);
-    }
-
     public void flush() {
 	this.getHibernateTemplate().flush();
     }
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java
===================================================================
diff -u -r9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java	(.../McQueContentDAO.java)	(revision 9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java	(.../McQueContentDAO.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -44,12 +44,8 @@
 
     private static final String REFRESH_QUESTION_CONTENT = "from mcQueContent in class McQueContent where mcQueContent.mcContentId=:mcContentId order by mcQueContent.displayOrder";
 
-    private static final String LOAD_QUESTION_CONTENT_BY_QUESTION_TEXT = "from mcQueContent in class McQueContent where mcQueContent.question=:question and mcQueContent.mcContentId=:mcContentUid";
-
     private static final String LOAD_QUESTION_CONTENT_BY_DISPLAY_ORDER = "from mcQueContent in class McQueContent where mcQueContent.displayOrder=:displayOrder and mcQueContent.mcContentId=:mcContentUid";
 
-    private static final String GET_NEXT_AVAILABLE_DISPLAY_ORDER = "from mcQueContent in class McQueContent where mcQueContent.mcContentId=:mcContentId";
-
     private static final String SORT_QUESTION_CONTENT_BY_DISPLAY_ORDER = "from mcQueContent in class McQueContent where mcQueContent.mcContentId=:mcContentId order by mcQueContent.displayOrder";
 
     @Override
@@ -67,11 +63,6 @@
     }
 
     @Override
-    public McQueContent getMcQueContentByUID(Long uid) {
-	return (McQueContent) this.getHibernateTemplate().get(McQueContent.class, uid);
-    }
-
-    @Override
     public List getQuestionsByContentUid(final long contentUid) {
 	HibernateTemplate templ = this.getHibernateTemplate();
 	List list = getSession().createQuery(LOAD_QUESTION_CONTENT_BY_CONTENT_ID).setLong("mcContentId", contentUid)
@@ -90,19 +81,6 @@
     }
 
     @Override
-    public McQueContent getQuestionContentByQuestionText(final String question, final Long mcContentUid) {
-	HibernateTemplate templ = this.getHibernateTemplate();
-	List list = getSession().createQuery(LOAD_QUESTION_CONTENT_BY_QUESTION_TEXT).setString("question", question)
-		.setLong("mcContentUid", mcContentUid.longValue()).list();
-
-	if (list != null && list.size() > 0) {
-	    McQueContent mcq = (McQueContent) list.get(0);
-	    return mcq;
-	}
-	return null;
-    }
-
-    @Override
     public McQueContent getQuestionContentByDisplayOrder(final Long displayOrder, final Long mcContentUid) {
 	HibernateTemplate templ = this.getHibernateTemplate();
 	List list = getSession().createQuery(LOAD_QUESTION_CONTENT_BY_DISPLAY_ORDER)
@@ -117,65 +95,11 @@
     }
 
     @Override
-    public void removeQuestionContentByMcUid(final Long mcContentUid) {
-	HibernateTemplate templ = this.getHibernateTemplate();
-	List list = getSession().createQuery(LOAD_QUESTION_CONTENT_BY_CONTENT_ID)
-		.setLong("mcContentId", mcContentUid.longValue()).list();
-
-	if (list != null && list.size() > 0) {
-	    Iterator listIterator = list.iterator();
-	    while (listIterator.hasNext()) {
-		McQueContent mcQueContent = (McQueContent) listIterator.next();
-		this.getSession().setFlushMode(FlushMode.AUTO);
-		templ.delete(mcQueContent);
-		templ.flush();
-	    }
-	}
-    }
-
-    @Override
-    public void resetAllQuestions(final Long mcContentUid) {
-	HibernateTemplate templ = this.getHibernateTemplate();
-	List list = getSession().createQuery(LOAD_QUESTION_CONTENT_BY_CONTENT_ID)
-		.setLong("mcContentId", mcContentUid.longValue()).list();
-
-	if (list != null && list.size() > 0) {
-	    Iterator listIterator = list.iterator();
-	    while (listIterator.hasNext()) {
-		McQueContent mcQueContent = (McQueContent) listIterator.next();
-		this.getSession().setFlushMode(FlushMode.AUTO);
-		templ.update(mcQueContent);
-	    }
-	}
-    }
-
-    @Override
-    public List getNextAvailableDisplayOrder(final long mcContentId) {
-	HibernateTemplate templ = this.getHibernateTemplate();
-	List list = getSession().createQuery(GET_NEXT_AVAILABLE_DISPLAY_ORDER).setLong("mcContentId", mcContentId)
-		.list();
-
-	return list;
-    }
-
-    @Override
-    public void saveMcQueContent(McQueContent mcQueContent) {
-	this.getHibernateTemplate().save(mcQueContent);
-    }
-
-    @Override
     public void saveOrUpdateMcQueContent(McQueContent mcQueContent) {
 	this.getHibernateTemplate().saveOrUpdate(mcQueContent);
     }
 
     @Override
-    public void removeMcQueContentByUID(Long uid) {
-	McQueContent mcq = (McQueContent) getHibernateTemplate().get(McQueContent.class, uid);
-	this.getSession().setFlushMode(FlushMode.AUTO);
-	this.getHibernateTemplate().delete(mcq);
-    }
-
-    @Override
     public void updateMcQueContent(McQueContent mcQueContent) {
 	this.getSession().setFlushMode(FlushMode.AUTO);
 	this.getHibernateTemplate().saveOrUpdate(mcQueContent);
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java
===================================================================
diff -u -rc369c0326857e08851d03a29d39d4337091f5253 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java	(.../McSessionDAO.java)	(revision c369c0326857e08851d03a29d39d4337091f5253)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java	(.../McSessionDAO.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -46,10 +46,6 @@
 
     private static final String LOAD_MCSESSION_BY_MCSESSIONID = "from McSession mcs where mcs.mcSessionId=?";
 
-    public McSession getMcSessionByUID(Long uid) {
-	return (McSession) this.getHibernateTemplate().get(McSession.class, uid);
-    }
-
     public McSession getMcSessionById(Long mcSessionId) {
 
 	List list = getSession().createQuery(LOAD_MCSESSION_BY_MCSESSIONID).setLong(0, mcSessionId.longValue()).list();
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
===================================================================
diff -u -r40eb54374e84591563d8b6a679ac719dbc85c8f7 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml	(.../mcApplicationContext.xml)	(revision 40eb54374e84591563d8b6a679ac719dbc85c8f7)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml	(.../mcApplicationContext.xml)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -96,6 +96,7 @@
 					<prop key="exportToolContent">PROPAGATION_REQUIRED,-McApplicationException</prop>
 					<prop key="import102ToolContent">PROPAGATION_REQUIRED,-McApplicationException</prop>
 					<prop key="setReflectiveData">PROPAGATION_REQUIRED,-McApplicationException</prop>
+					<prop key="setDefineLater">PROPAGATION_REQUIRED,-McApplicationException</prop>
 					<prop key="checkLeaderSelectToolForSessionLeader">PROPAGATION_REQUIRED,-McApplicationException</prop>
 				</props>
 			</property>
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
===================================================================
diff -u -r40eb54374e84591563d8b6a679ac719dbc85c8f7 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java	(.../IMcService.java)	(revision 40eb54374e84591563d8b6a679ac719dbc85c8f7)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java	(.../IMcService.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -72,16 +72,14 @@
     void createMc(McContent mcContent) throws McApplicationException;
 
     McContent getMcContent(Long toolContentId) throws McApplicationException;
+    
+    void setDefineLater(String strToolContentID, boolean value);
 
-    void createQuestion(McQueContent mcQueContent) throws McApplicationException;
-
     void updateQuestion(McQueContent mcQueContent) throws McApplicationException;
 
     McQueContent getQuestionByDisplayOrder(final Long displayOrder, final Long mcContentUid)
 	    throws McApplicationException;
 
-    void createMcSession(McSession mcSession) throws McApplicationException;
-
     McQueUsr createMcUser(Long toolSessionId) throws McApplicationException;
 
     McQueUsr getMcUserBySession(final Long queUsrId, final Long mcSessionUid) throws McApplicationException;
@@ -92,30 +90,21 @@
 
     void removeMcQueContent(McQueContent mcQueContent) throws McApplicationException;
 
-    McQueContent getMcQueContentByUID(Long uid) throws McApplicationException;
-
     void saveOrUpdateMcQueContent(McQueContent mcQueContent) throws McApplicationException;
     
+    /**
+     * persists the questions
+     */
+    McContent createQuestions(List<McQuestionDTO> questionDTOs, McContent content);
+    
     void releaseQuestionsFromCache(McContent content);
 
-    void removeQuestionContentByMcUid(final Long mcContentUid) throws McApplicationException;
-
-    McOptsContent getMcOptionsContentByUID(Long uid) throws McApplicationException;
-
-    void resetAllQuestions(final Long mcContentUid) throws McApplicationException;
-
     List refreshQuestionContent(final Long mcContentId) throws McApplicationException;
 
     List getAllQuestionsSorted(final long mcContentId) throws McApplicationException;
 
     McQueContent getQuestionByUid(Long uid);
 
-    void removeMcOptionsContent(McOptsContent mcOptsContent);
-
-    McQueContent getQuestionByQuestionText(final String question, final Long mcContentUid);
-
-    void removeMcQueContentByUID(Long uid) throws McApplicationException;
-
     McQueUsr getMcUserByUID(Long uid) throws McApplicationException;
 
     List<McQueContent> getQuestionsByContentUid(final Long mcContentId) throws McApplicationException;
@@ -124,38 +113,16 @@
 
     void updateMc(McContent mc) throws McApplicationException;
 
-    void updateMcSession(McSession mcSession) throws McApplicationException;
-
     void updateMcQueUsr(McQueUsr mcQueUsr) throws McApplicationException;
 
     List<McOptionDTO> getOptionDtos(Long mcQueContentId) throws McApplicationException;
-
-    McSession getMcSessionByUID(Long uid) throws McApplicationException;
-
+    
     List<McUsrAttempt> getFinalizedUserAttempts(final McQueUsr user) throws McApplicationException;
 
-    void deleteMc(McContent mc) throws McApplicationException;
-
-    void deleteMcById(Long mcId) throws McApplicationException;
-
-    void deleteMcQueUsr(McQueUsr mcQueUsr) throws McApplicationException;
-
     List findOptionsByQuestionUid(Long mcQueContentId) throws McApplicationException;
 
-    void saveOption(McOptsContent mcOptsContent) throws McApplicationException;
-
-    McOptsContent getOptionContentByOptionText(final String option, final Long mcQueContentUid);
-
     void updateMcOptionsContent(McOptsContent mcOptsContent) throws McApplicationException;
 
-    void deleteMcOptionsContent(McOptsContent mcOptsContent) throws McApplicationException;
-
-    void deleteMcOptionsContentByUID(Long uid) throws McApplicationException;
-
-    void saveMcContent(McContent mc) throws McApplicationException;
-
-    boolean studentActivityOccurredGlobal(McContent mcContent) throws McApplicationException;
-
     McUsrAttempt getUserAttemptByQuestion(Long queUsrUid, Long mcQueContentId)
 	    throws McApplicationException;
 
@@ -181,10 +148,6 @@
 
     long getToolDefaultContentIdBySignature(String toolSignature) throws McApplicationException;
 
-    List getNextAvailableDisplayOrder(final long mcContentId) throws McApplicationException;
-
-    List findMcOptionCorrectByQueId(Long mcQueContentId) throws McApplicationException;
-
     Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry);
 
     NotebookEntry getEntry(Long id, Integer idType, String signature, Integer userID);
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
===================================================================
diff -u -r40eb54374e84591563d8b6a679ac719dbc85c8f7 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	(.../McServicePOJO.java)	(revision 40eb54374e84591563d8b6a679ac719dbc85c8f7)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	(.../McServicePOJO.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -28,6 +28,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -39,6 +40,7 @@
 import java.util.TreeSet;
 import java.util.Vector;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
 import org.apache.commons.lang.StringUtils;
@@ -169,7 +171,7 @@
 
 		// set group leader
 		mcSession.setGroupLeader(leader);
-		this.updateMcSession(mcSession);
+		mcSessionDAO.updateMcSession(mcSession);
 	    }
 	}
 
@@ -209,6 +211,7 @@
 	}
     }
 
+    @Override
     public void createMc(McContent mcContent) throws McApplicationException {
 	try {
 	    mcContentDAO.saveMcContent(mcContent);
@@ -217,31 +220,26 @@
 	}
     }
 
+    @Override
     public McContent getMcContent(Long toolContentId) throws McApplicationException {
 	try {
 	    return mcContentDAO.findMcContentById(toolContentId);
 	} catch (DataAccessException e) {
 	    throw new McApplicationException("Exception occured when lams is loading mc content: " + e.getMessage(), e);
 	}
     }
+    
+    @Override
+    public void setDefineLater(String strToolContentID, boolean value) {
 
-    public void updateMcContent(McContent mcContent) throws McApplicationException {
-	try {
-	    mcContentDAO.updateMcContent(mcContent);
-	} catch (DataAccessException e) {
-	    throw new McApplicationException("Exception occured when lams is updating mc content: " + e.getMessage(), e);
+	McContent mcContent = getMcContent(new Long(strToolContentID));
+	if (mcContent != null) {
+	    mcContent.setDefineLater(value);
+	    updateMc(mcContent);
 	}
     }
 
-    public void createQuestion(McQueContent mcQueContent) throws McApplicationException {
-	try {
-	    mcQueContentDAO.saveMcQueContent(mcQueContent);
-	} catch (DataAccessException e) {
-	    throw new McApplicationException("Exception occured when lams is creating mc que content: "
-		    + e.getMessage(), e);
-	}
-    }
-
+    @Override
     public void updateQuestion(McQueContent mcQueContent) throws McApplicationException {
 	try {
 	    mcQueContentDAO.updateMcQueContent(mcQueContent);
@@ -252,6 +250,7 @@
 
     }
 
+    @Override
     public McQueContent getQuestionByDisplayOrder(final Long displayOrder, final Long mcContentUid)
 	    throws McApplicationException {
 	try {
@@ -262,15 +261,7 @@
 	}
     }
 
-    public McQueContent getMcQueContentByUID(Long uid) throws McApplicationException {
-	try {
-	    return mcQueContentDAO.getMcQueContentByUID(uid);
-	} catch (DataAccessException e) {
-	    throw new McApplicationException("Exception occured when lams is getting mc que content by uid: "
-		    + e.getMessage(), e);
-	}
-    }
-
+    @Override
     public List getAllQuestionsSorted(final long mcContentId) throws McApplicationException {
 	try {
 	    return mcQueContentDAO.getAllQuestionEntriesSorted(mcContentId);
@@ -280,6 +271,7 @@
 	}
     }
 
+    @Override
     public void saveOrUpdateMcQueContent(McQueContent mcQueContent) throws McApplicationException {
 	try {
 	    mcQueContentDAO.saveOrUpdateMcQueContent(mcQueContent);
@@ -290,56 +282,90 @@
     }
     
     @Override
-    public void releaseQuestionsFromCache(McContent content) {
-	for (McQueContent question : (Set<McQueContent>)content.getMcQueContents()) {
-	    mcQueContentDAO.releaseQuestionFromCache(question);
-	}
-    }
+    public McContent createQuestions(List<McQuestionDTO> questionDTOs, McContent content) {
 
-    public void removeQuestionContentByMcUid(final Long mcContentUid) throws McApplicationException {
-	try {
-	    mcQueContentDAO.removeQuestionContentByMcUid(mcContentUid);
-	} catch (DataAccessException e) {
-	    throw new McApplicationException(
-		    "Exception occured when lams is removing mc que content by mc content id: " + e.getMessage(), e);
-	}
-    }
+	int displayOrder = 0;
+	for (McQuestionDTO questionDTO : questionDTOs) {
+	    String currentQuestionText = questionDTO.getQuestion();
 
-    public void resetAllQuestions(final Long mcContentUid) throws McApplicationException {
-	try {
-	    mcQueContentDAO.resetAllQuestions(mcContentUid);
-	} catch (DataAccessException e) {
-	    throw new McApplicationException("Exception occured when lams is resetting all questions: "
-		    + e.getMessage(), e);
-	}
-    }
+	    // skip empty questions
+	    if (currentQuestionText.isEmpty()) {
+		continue;
+	    }
 
-    public List getNextAvailableDisplayOrder(final long mcContentId) throws McApplicationException {
-	try {
-	    return mcQueContentDAO.getNextAvailableDisplayOrder(mcContentId);
-	} catch (DataAccessException e) {
-	    throw new McApplicationException(
-		    "Exception occured when lams is getting the next available display order: " + e.getMessage(), e);
-	}
-    }
+	    ++displayOrder;
+	    String currentFeedback = questionDTO.getFeedback();
+	    String currentMark = questionDTO.getMark();
+	    /* set the default mark in case it is not provided */
+	    if (currentMark == null) {
+		currentMark = "1";
+	    }
 
-    public void createMcSession(McSession mcSession) throws McApplicationException {
-	try {
-	    mcSessionDAO.saveMcSession(mcSession);
-	} catch (DataAccessException e) {
-	    throw new McApplicationException("Exception occured when lams is creating mc session: " + e.getMessage(), e);
+	    McQueContent question = getQuestionByUid(questionDTO.getUid());
+
+	    // in case question doesn't exist
+	    if (question == null) {
+		question = new McQueContent(currentQuestionText, new Integer(displayOrder), new Integer(currentMark),
+			currentFeedback, content, null, null);
+
+		// adding a new question to content
+		content.getMcQueContents().add(question);
+		question.setMcContent(content);
+
+		// in case question exists already
+	    } else {
+
+		question.setQuestion(currentQuestionText);
+		question.setFeedback(currentFeedback);
+		question.setDisplayOrder(new Integer(displayOrder));
+		question.setMark(new Integer(currentMark));
+	    }
+
+	    // persist candidate answers
+	    List<McOptionDTO> optionDTOs = questionDTO.getListCandidateAnswersDTO();
+	    Set<McOptsContent> oldOptions = question.getMcOptionsContents();
+	    Set<McOptsContent> newOptions = new HashSet<McOptsContent>();
+	    int displayOrderOption = 1;
+	    for (McOptionDTO optionDTO : optionDTOs) {
+
+		Long optionUid = optionDTO.getUid();
+		String optionText = optionDTO.getCandidateAnswer();
+		boolean isCorrectOption = "Correct".equals(optionDTO.getCorrect());
+		
+		//find persisted option if it exists
+		McOptsContent option = new McOptsContent();
+		for (McOptsContent oldOption: oldOptions) {
+		    if (oldOption.getUid().equals(optionUid)) {
+			option = oldOption;
+		    }
+		}
+		
+		option.setDisplayOrder(displayOrderOption);
+		option.setCorrectOption(isCorrectOption);
+		option.setMcQueOptionText(optionText);
+		option.setMcQueContent(question);
+
+		newOptions.add(option);
+		displayOrderOption++;
+	    }
+	    
+	    question.setMcOptionsContents(newOptions);
+
+	    // updating the existing question content
+	    updateQuestion(question);
+
 	}
+	return content;
     }
-
-    public McSession getMcSessionByUID(Long uid) throws McApplicationException {
-	try {
-	    return mcSessionDAO.getMcSessionByUID(uid);
-	} catch (DataAccessException e) {
-	    throw new McApplicationException("Exception occured when lams is getting mcSession my uid: "
-		    + e.getMessage(), e);
+    
+    @Override
+    public void releaseQuestionsFromCache(McContent content) {
+	for (McQueContent question : (Set<McQueContent>)content.getMcQueContents()) {
+	    mcQueContentDAO.releaseQuestionFromCache(question);
 	}
     }
     
+    @Override
     public McQueUsr createMcUser(Long toolSessionID) throws McApplicationException {
 	try {
 	    HttpSession ss = SessionManager.getSession();
@@ -358,6 +384,7 @@
 	}
     }
 
+    @Override
     public void updateMcQueUsr(McQueUsr mcQueUsr) throws McApplicationException {
 	try {
 	    mcUserDAO.updateMcUser(mcQueUsr);
@@ -366,6 +393,7 @@
 	}
     }
 
+    @Override
     public McQueUsr getMcUserBySession(final Long queUsrId, final Long mcSessionUid) throws McApplicationException {
 	try {
 	    return mcUserDAO.getMcUserBySession(queUsrId, mcSessionUid);
@@ -374,6 +402,7 @@
 	}
     }
 
+    @Override
     public McQueUsr getMcUserByUID(Long uid) throws McApplicationException {
 	try {
 	    return mcUserDAO.getMcUserByUID(uid);
@@ -433,6 +462,7 @@
 	}
     }
 
+    @Override
     public void updateMcUsrAttempt(McUsrAttempt mcUsrAttempt) throws McApplicationException {
 	try {
 	    mcUsrAttemptDAO.updateMcUsrAttempt(mcUsrAttempt);
@@ -591,6 +621,7 @@
 	return listMonitoredMarksContainerDTO;
     }
 
+    @Override
     public List<McUsrAttempt> getFinalizedUserAttempts(final McQueUsr user) throws McApplicationException {
 	try {
 	    return mcUsrAttemptDAO.getFinalizedUserAttempts(user.getUid());
@@ -601,6 +632,7 @@
 	}
     }
 
+    @Override
     public McUsrAttempt getUserAttemptByQuestion(Long queUsrUid, Long mcQueContentId)
 	    throws McApplicationException {
 	try {
@@ -612,6 +644,7 @@
 	}
     }
 
+    @Override
     public List<McQueContent> getQuestionsByContentUid(final Long contentUid) throws McApplicationException {
 	try {
 	    return mcQueContentDAO.getQuestionsByContentUid(contentUid.longValue());
@@ -621,15 +654,7 @@
 	}
     }
 
-    public void removeMcQueContentByUID(Long uid) throws McApplicationException {
-	try {
-	    mcQueContentDAO.removeMcQueContentByUID(uid);
-	} catch (DataAccessException e) {
-	    throw new McApplicationException("Exception occured when lams is removing by uid  mc question content: "
-		    + e.getMessage(), e);
-	}
-    }
-
+    @Override
     public List refreshQuestionContent(final Long mcContentId) throws McApplicationException {
 	try {
 	    return mcQueContentDAO.refreshQuestionContent(mcContentId);
@@ -640,6 +665,7 @@
 
     }
 
+    @Override
     public void removeMcQueContent(McQueContent mcQueContent) throws McApplicationException {
 	try {
 	    mcQueContentDAO.removeMcQueContent(mcQueContent);
@@ -649,15 +675,7 @@
 	}
     }
 
-    public void removeMcOptionsContent(McOptsContent mcOptsContent) throws McApplicationException {
-	try {
-	    mcOptionsContentDAO.removeMcOptionsContent(mcOptsContent);
-	} catch (DataAccessException e) {
-	    throw new McApplicationException("Exception occured when lams is removing" + " the mc options content: "
-		    + e.getMessage(), e);
-	}
-    }
-
+    @Override
     public List<McOptionDTO> getOptionDtos(Long mcQueContentId) throws McApplicationException {
 	try {
 	    return mcOptionsContentDAO.getOptionDtos(mcQueContentId);
@@ -667,15 +685,7 @@
 	}
     }
 
-    public McQueContent getQuestionByQuestionText(final String question, final Long mcContentId) {
-	try {
-	    return mcQueContentDAO.getQuestionContentByQuestionText(question, mcContentId);
-	} catch (DataAccessException e) {
-	    throw new McApplicationException(
-		    "Exception occured when lams is retrieving question content by question text: " + e.getMessage(), e);
-	}
-    }
-
+    @Override
     public McSession getMcSessionById(Long mcSessionId) throws McApplicationException {
 	try {
 	    return mcSessionDAO.getMcSessionById(mcSessionId);
@@ -685,6 +695,7 @@
 	}
     }
 
+    @Override
     public void updateMc(McContent mc) throws McApplicationException {
 	try {
 	    mcContentDAO.updateMcContent(mc);
@@ -694,61 +705,12 @@
 	}
     }
 
-    public void updateMcSession(McSession mcSession) throws McApplicationException {
-	try {
-	    mcSessionDAO.updateMcSession(mcSession);
-	} catch (DataAccessException e) {
-	    throw new McApplicationException("Exception occured when lams is updating mc session : " + e.getMessage(),
-		    e);
-	}
-    }
-
-    public void deleteMc(McContent mc) throws McApplicationException {
-	try {
-	    mcContentDAO.removeMc(mc);
-	} catch (DataAccessException e) {
-	    throw new McApplicationException("Exception occured when lams is removing" + " the mc content: "
-		    + e.getMessage(), e);
-	}
-    }
-
-    public void deleteMcById(Long mcId) throws McApplicationException {
-	try {
-	    mcContentDAO.removeMcById(mcId);
-	} catch (DataAccessException e) {
-	    throw new McApplicationException("Exception occured when lams is removing by id" + " the mc content: "
-		    + e.getMessage(), e);
-	}
-    }
-
-    /**
-     * Return the top, lowest and average mark for all learners for one particular tool session.
-     * 
-     * @param request
-     * @return top mark, lowest mark, average mark in that order
-     */
+    @Override
     public Integer[] getMarkStatistics(McSession mcSession) {
 	return mcUserDAO.getMarkStatisticsForSession(mcSession.getUid());
     }
 
-    public void deleteMcQueUsr(McQueUsr mcQueUsr) throws McApplicationException {
-	try {
-	    mcUserDAO.removeMcUser(mcQueUsr);
-	} catch (DataAccessException e) {
-	    throw new McApplicationException(
-		    "Exception occured when lams is removing" + " the user: " + e.getMessage(), e);
-	}
-    }
-
-    public void saveMcContent(McContent mc) throws McApplicationException {
-	try {
-	    mcContentDAO.saveMcContent(mc);
-	} catch (DataAccessException e) {
-	    throw new McApplicationException("Exception occured when lams is saving" + " the mc content: "
-		    + e.getMessage(), e);
-	}
-    }
-
+    @Override
     public List<McOptsContent> findOptionsByQuestionUid(Long mcQueContentId) throws McApplicationException {
 	try {
 	    return mcOptionsContentDAO.findMcOptionsContentByQueId(mcQueContentId);
@@ -758,15 +720,7 @@
 	}
     }
 
-    public McOptsContent getMcOptionsContentByUID(Long uid) throws McApplicationException {
-	try {
-	    return mcOptionsContentDAO.getMcOptionsContentByUID(uid);
-	} catch (DataAccessException e) {
-	    throw new McApplicationException("Exception occured when lams is getting opt content by uid"
-		    + e.getMessage(), e);
-	}
-    }
-
+    @Override
     public McQueContent getQuestionByUid(Long uid) {
 	if (uid == null) {
 	    return null;
@@ -775,24 +729,7 @@
 	return mcQueContentDAO.findMcQuestionContentByUid(uid);
     }
 
-    public void saveOption(McOptsContent mcOptsContent) throws McApplicationException {
-	try {
-	    mcOptionsContentDAO.saveMcOptionsContent(mcOptsContent);
-	} catch (DataAccessException e) {
-	    throw new McApplicationException("Exception occured when lams is saving" + " the mc options content: "
-		    + e.getMessage(), e);
-	}
-    }
-
-    public McOptsContent getOptionContentByOptionText(final String option, final Long mcQueContentUid) {
-	try {
-	    return mcOptionsContentDAO.getOptionContentByOptionText(option, mcQueContentUid);
-	} catch (DataAccessException e) {
-	    throw new McApplicationException("Exception occured when lams is returning the"
-		    + " option by option text: " + e.getMessage(), e);
-	}
-    }
-
+    @Override
     public void updateMcOptionsContent(McOptsContent mcOptsContent) throws McApplicationException {
 	try {
 	    mcOptionsContentDAO.updateMcOptionsContent(mcOptsContent);
@@ -801,45 +738,6 @@
 		    + e.getMessage(), e);
 	}
     }
-
-    public List findMcOptionCorrectByQueId(Long mcQueContentId) throws McApplicationException {
-	try {
-	    return mcOptionsContentDAO.findMcOptionCorrectByQueId(mcQueContentId);
-	} catch (DataAccessException e) {
-	    throw new McApplicationException("Exception occured when lams is getting correct/incorrect options list"
-		    + " the mc options content: " + e.getMessage(), e);
-	}
-
-    }
-
-    public void deleteMcOptionsContent(McOptsContent mcOptsContent) throws McApplicationException {
-	try {
-	    mcOptionsContentDAO.removeMcOptionsContent(mcOptsContent);
-	} catch (DataAccessException e) {
-	    throw new McApplicationException("Exception occured when lams is removing" + " the mc options content: "
-		    + e.getMessage(), e);
-	}
-    }
-
-    public void deleteMcOptionsContentByUID(Long uid) throws McApplicationException {
-	try {
-	    mcOptionsContentDAO.removeMcOptionsContentByUID(uid);
-	} catch (DataAccessException e) {
-	    throw new McApplicationException("Exception occured when lams is removing by uid"
-		    + " the mc options content: " + e.getMessage(), e);
-	}
-    }
-
-    /**
-     * checks the parameter content in the user responses table
-     * 
-     * @param mcContent
-     * @return boolean
-     * @throws McApplicationException
-     */
-    public boolean studentActivityOccurredGlobal(McContent mcContent) throws McApplicationException {
-	return !mcContent.getMcSessions().isEmpty();
-    }
     
     @Override
     public void changeUserAttemptMark(Long userAttemptUid, Integer newMark) {
@@ -1387,7 +1285,7 @@
 	    throw new DataMissingException("mcContent is missing");
 	}
 	mcContent.setDefineLater(false);
-	saveMcContent(mcContent);
+	mcContentDAO.saveMcContent(mcContent);
     }    
 
     @SuppressWarnings("unchecked")
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java
===================================================================
diff -u -r9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java	(.../AuthoringUtil.java)	(revision 9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java	(.../AuthoringUtil.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -503,85 +503,6 @@
 	return mcContent;
     }
 
-    /**
-     * persists the questions
-     */
-    public static McContent createQuestions(List<McQuestionDTO> questionDTOs, IMcService mcService, McContent content) {
-
-	int displayOrder = 0;
-	for (McQuestionDTO questionDTO : questionDTOs) {
-	    String currentQuestionText = questionDTO.getQuestion();
-
-	    // skip empty questions
-	    if (currentQuestionText.isEmpty()) {
-		continue;
-	    }
-
-	    ++displayOrder;
-	    String currentFeedback = questionDTO.getFeedback();
-	    String currentMark = questionDTO.getMark();
-	    /* set the default mark in case it is not provided */
-	    if (currentMark == null) {
-		currentMark = "1";
-	    }
-
-	    McQueContent question = mcService.getQuestionByUid(questionDTO.getUid());
-
-	    // in case question doesn't exist
-	    if (question == null) {
-		question = new McQueContent(currentQuestionText, new Integer(displayOrder), new Integer(currentMark),
-			currentFeedback, content, null, null);
-
-		// adding a new question to content
-		content.getMcQueContents().add(question);
-		question.setMcContent(content);
-
-		// in case question exists already
-	    } else {
-
-		question.setQuestion(currentQuestionText);
-		question.setFeedback(currentFeedback);
-		question.setDisplayOrder(new Integer(displayOrder));
-		question.setMark(new Integer(currentMark));
-	    }
-
-	    // persist candidate answers
-	    List<McOptionDTO> optionDTOs = questionDTO.getListCandidateAnswersDTO();
-	    Set<McOptsContent> oldOptions = question.getMcOptionsContents();
-	    Set<McOptsContent> newOptions = new HashSet<McOptsContent>();
-	    int displayOrderOption = 1;
-	    for (McOptionDTO optionDTO : optionDTOs) {
-
-		Long optionUid = optionDTO.getUid();
-		String optionText = optionDTO.getCandidateAnswer();
-		boolean isCorrectOption = "Correct".equals(optionDTO.getCorrect());
-		
-		//find persisted option if it exists
-		McOptsContent option = new McOptsContent();
-		for (McOptsContent oldOption: oldOptions) {
-		    if (oldOption.getUid().equals(optionUid)) {
-			option = oldOption;
-		    }
-		}
-		
-		option.setDisplayOrder(displayOrderOption);
-		option.setCorrectOption(isCorrectOption);
-		option.setMcQueOptionText(optionText);
-		option.setMcQueContent(question);
-
-		newOptions.add(option);
-		displayOrderOption++;
-	    }
-	    
-	    question.setMcOptionsContents(newOptions);
-
-	    // updating the existing question content
-	    mcService.updateQuestion(question);
-
-	}
-	return content;
-    }
-
     public static Map buildDynamicPassMarkMap(List questionDTOs, boolean initialScreen) {
 
 	Map map = new TreeMap(new McComparator());
@@ -637,53 +558,9 @@
     }
 
     /**
-     * repopulateOptionsBox
-     */
-    public static List<McOptionDTO> repopulateOptionDTOs(HttpServletRequest request, boolean isAddBlankOptions) {
-
-	String correct = request.getParameter("correct");
-
-	/* check this logic again */
-	int intCorrect = 0;
-	if (correct != null) {
-	    intCorrect = new Integer(correct).intValue();
-	}
-
-	List<McOptionDTO> optionDtos = new LinkedList<McOptionDTO>();
-
-	for (int i = 0; i < McAppConstants.MAX_OPTION_COUNT; i++) {
-	    String optionText = request.getParameter("ca" + i);
-	    Long optionUid = WebUtil.readLongParam(request, "caUid" + i, true);
-
-	    String isCorrect = "Incorrect";
-
-	    if (i == intCorrect) {
-		isCorrect = "Correct";
-	    }
-
-	    if (optionText != null) {
-		McOptionDTO optionDTO = new McOptionDTO();
-		optionDTO.setUid(optionUid);
-		optionDTO.setCandidateAnswer(optionText);
-		optionDTO.setCorrect(isCorrect);
-		optionDtos.add(optionDTO);
-	    }
-	}
-
-	if (isAddBlankOptions) {
-	    McOptionDTO optionDTO = new McOptionDTO();
-	    optionDTO.setCandidateAnswer("");
-	    optionDTO.setCorrect("Incorrect");
-	    optionDtos.add(optionDTO);
-	}
-
-	return optionDtos;
-    }
-
-    /**
      * generates a list for holding default questions and their candidate answers
      */
-    public static List<McQuestionDTO> buildDefaultQuestions(McContent mcContent, IMcService mcService) {
+    public static List<McQuestionDTO> buildDefaultQuestions(McContent mcContent) {
 	List<McQuestionDTO> questionDTOs = new LinkedList<McQuestionDTO>();
 
 	Long mapIndex = new Long(1);
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
===================================================================
diff -u -r40eb54374e84591563d8b6a679ac719dbc85c8f7 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision 40eb54374e84591563d8b6a679ac719dbc85c8f7)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java	(.../McAction.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -144,7 +144,7 @@
 	    if (mode.isTeacher()) {
 		Set<McQueContent> oldQuestions = mcContent.getMcQueContents();
 		mcService.releaseQuestionsFromCache(mcContent);
-		McUtils.setDefineLater(request, false, strToolContentID, mcService);
+		mcService.setDefineLater(strToolContentID, false);
 		    
 		// recalculate User Answers
 		mcService.recalculateUserAnswers(mcContent, oldQuestions, questionDTOs, deletedQuestionDTOs);
@@ -170,7 +170,7 @@
 	    mcContent = AuthoringUtil.saveOrUpdateMcContent(mcService, request, mcContentTest, strToolContentID);
 	    
 	    //store questions
-	    mcContent = AuthoringUtil.createQuestions(questionDTOs, mcService, mcContent);
+	    mcContent = mcService.createQuestions(questionDTOs, mcContent);
 
 	    if (mcContent != null) {
 
@@ -253,7 +253,7 @@
 
 	String passmark = request.getParameter("passmark");
 
-	List<McOptionDTO> options = AuthoringUtil.repopulateOptionDTOs(request, false);
+	List<McOptionDTO> options = repopulateOptionDTOs(request, false);
 	options = AuthoringUtil.removeBlankOptions(options);
 
 	List<McQuestionDTO> questionDTOs = (List<McQuestionDTO>) sessionMap
@@ -583,7 +583,7 @@
 	String passmark = request.getParameter("passmark");
 	mcGeneralAuthoringDTO.setPassMarkValue(passmark);
 
-	List<McOptionDTO> optionDtos = AuthoringUtil.repopulateOptionDTOs(request, false);
+	List<McOptionDTO> optionDtos = repopulateOptionDTOs(request, false);
 	optionDtos = AuthoringUtil.removeBlankOptions(optionDtos);
 
 	if ((newQuestionParam != null) && (newQuestionParam.length() > 0)) {
@@ -1132,7 +1132,7 @@
 	String candidateIndex = request.getParameter("candidateIndex");
 	request.setAttribute("candidateIndex", candidateIndex);
 
-	List<McOptionDTO> optionDtos = AuthoringUtil.repopulateOptionDTOs(request, false);
+	List<McOptionDTO> optionDtos = repopulateOptionDTOs(request, false);
 
 	List<McQuestionDTO> questionDTOs = (List) sessionMap.get(McAppConstants.LIST_QUESTION_DTOS);
 
@@ -1251,7 +1251,7 @@
 	String candidateIndex = request.getParameter("candidateIndex");
 	request.setAttribute("candidateIndex", candidateIndex);
 
-	List<McOptionDTO> optionDtos = AuthoringUtil.repopulateOptionDTOs(request, false);
+	List<McOptionDTO> optionDtos = repopulateOptionDTOs(request, false);
 
 	List<McQuestionDTO> questionDTOs = (List) sessionMap.get(McAppConstants.LIST_QUESTION_DTOS);
 
@@ -1382,7 +1382,7 @@
 	}
 
 	//update options
-	List<McOptionDTO> optionDtos = AuthoringUtil.repopulateOptionDTOs(request, false);
+	List<McOptionDTO> optionDtos = repopulateOptionDTOs(request, false);
 	List<McOptionDTO> listFinalCandidatesDTO = new LinkedList<McOptionDTO>();
 	McOptionDTO mcOptionDTO = null;
 	Iterator listCaIterator = optionDtos.iterator();
@@ -1486,7 +1486,7 @@
 
 	List<McQuestionDTO> questionDTOs = (List) sessionMap.get(McAppConstants.LIST_QUESTION_DTOS);
 
-	List<McOptionDTO> optionDtos = AuthoringUtil.repopulateOptionDTOs(request, true);
+	List<McOptionDTO> optionDtos = repopulateOptionDTOs(request, true);
 
 	String newQuestion = request.getParameter("newQuestion");
 
@@ -1658,7 +1658,7 @@
 	String candidateIndex = request.getParameter("candidateIndex");
 	request.setAttribute("candidateIndex", candidateIndex);
 
-	List<McOptionDTO> optionDtos = AuthoringUtil.repopulateOptionDTOs(request, false);
+	List<McOptionDTO> optionDtos = repopulateOptionDTOs(request, false);
 
 	List<McQuestionDTO> questionDTOs = (List) sessionMap.get(McAppConstants.LIST_QUESTION_DTOS);
 
@@ -1743,7 +1743,7 @@
 	String candidateIndex = request.getParameter("candidateIndex");
 	request.setAttribute("candidateIndex", candidateIndex);
 
-	List<McOptionDTO> optionDtos = AuthoringUtil.repopulateOptionDTOs(request, false);
+	List<McOptionDTO> optionDtos = repopulateOptionDTOs(request, false);
 
 	List<McQuestionDTO> questionDTOs = (List) sessionMap.get(McAppConstants.LIST_QUESTION_DTOS);
 	sessionMap.put(McAppConstants.LIST_QUESTION_DTOS, questionDTOs);
@@ -1827,7 +1827,7 @@
 	// removeAddedCandidate
 	McQuestionDTO newQuestionDTO = (McQuestionDTO) sessionMap.get(McAppConstants.NEW_QUESTION_DTO);
 	
-	List<McOptionDTO> optionDtos = AuthoringUtil.repopulateOptionDTOs(request, false);
+	List<McOptionDTO> optionDtos = repopulateOptionDTOs(request, false);
 	List<McOptionDTO> listFinalCandidatesDTO = new LinkedList<McOptionDTO>();
 	int caIndex = 0;
 	for (McOptionDTO mcOptionDTO : optionDtos) {
@@ -1915,7 +1915,7 @@
 
 	List<McQuestionDTO> questionDTOs = (List) sessionMap.get(McAppConstants.LIST_QUESTION_DTOS);
 
-	List<McOptionDTO> optionDtos = AuthoringUtil.repopulateOptionDTOs(request, true);
+	List<McOptionDTO> optionDtos = repopulateOptionDTOs(request, true);
 
 	String newQuestion = request.getParameter("newQuestion");
 
@@ -2012,4 +2012,48 @@
 	return mode;
     }
 
+    /**
+     * repopulateOptionsBox
+     */
+    private static List<McOptionDTO> repopulateOptionDTOs(HttpServletRequest request, boolean isAddBlankOptions) {
+
+	String correct = request.getParameter("correct");
+
+	/* check this logic again */
+	int intCorrect = 0;
+	if (correct != null) {
+	    intCorrect = new Integer(correct).intValue();
+	}
+
+	List<McOptionDTO> optionDtos = new LinkedList<McOptionDTO>();
+
+	for (int i = 0; i < McAppConstants.MAX_OPTION_COUNT; i++) {
+	    String optionText = request.getParameter("ca" + i);
+	    Long optionUid = WebUtil.readLongParam(request, "caUid" + i, true);
+
+	    String isCorrect = "Incorrect";
+
+	    if (i == intCorrect) {
+		isCorrect = "Correct";
+	    }
+
+	    if (optionText != null) {
+		McOptionDTO optionDTO = new McOptionDTO();
+		optionDTO.setUid(optionUid);
+		optionDTO.setCandidateAnswer(optionText);
+		optionDTO.setCorrect(isCorrect);
+		optionDtos.add(optionDTO);
+	    }
+	}
+
+	if (isAddBlankOptions) {
+	    McOptionDTO optionDTO = new McOptionDTO();
+	    optionDTO.setCandidateAnswer("");
+	    optionDTO.setCorrect("Incorrect");
+	    optionDtos.add(optionDTO);
+	}
+
+	return optionDtos;
+    }
+
 }
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
===================================================================
diff -u -r9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	(.../McMonitoringAction.java)	(revision 9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	(.../McMonitoringAction.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -125,7 +125,7 @@
 	List<ReflectionDTO> reflectionsContainerDTO = mcService.getReflectionList(mcContent, null);
 	request.setAttribute(REFLECTIONS_CONTAINER_DTO, reflectionsContainerDTO);
 
-	if (mcService.studentActivityOccurredGlobal(mcContent)) {
+	if (!mcContent.getMcSessions().isEmpty()) {
 	    // USER_EXCEPTION_NO_TOOL_SESSIONS is set to false
 	    mcGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(false).toString());
 	} else {
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java
===================================================================
diff -u -r9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java	(.../McMonitoringStarterAction.java)	(revision 9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java	(.../McMonitoringStarterAction.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -146,7 +146,7 @@
 	List<ReflectionDTO> reflectionsContainerDTO = service.getReflectionList(mcContent, null);
 	request.setAttribute(REFLECTIONS_CONTAINER_DTO, reflectionsContainerDTO);
 
-	if (service.studentActivityOccurredGlobal(mcContent)) {
+	if (!mcContent.getMcSessions().isEmpty()) {
 	    // USER_EXCEPTION_NO_TOOL_SESSIONS is set to false
 	    mcGeneralMonitoringDTO.setUserExceptionNoToolSessions(new Boolean(false).toString());
 	} else {
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McPedagogicalPlannerForm.java
===================================================================
diff -u -r9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McPedagogicalPlannerForm.java	(.../McPedagogicalPlannerForm.java)	(revision 9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McPedagogicalPlannerForm.java	(.../McPedagogicalPlannerForm.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -127,7 +127,7 @@
 	if (mcContent != null) {
 	    setToolContentID(mcContent.getMcContentId());
 
-	    List<McQuestionDTO> questionDtos = AuthoringUtil.buildDefaultQuestions(mcContent, mcService);
+	    List<McQuestionDTO> questionDtos = AuthoringUtil.buildDefaultQuestions(mcContent);
 
 	    StringBuilder candidateAnswersBuilder = new StringBuilder();
 	    setCandidateAnswerCount(new ArrayList<Integer>(questionDtos.size()));
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java
===================================================================
diff -u -r9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java	(.../McStarterAction.java)	(revision 9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java	(.../McStarterAction.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -102,7 +102,7 @@
 	ToolAccessMode mode = getAccessMode(request);
 	// request is from monitoring module
 	if (mode.isTeacher()) {
-	    McUtils.setDefineLater(request, true, strToolContentID, mcService);
+	    mcService.setDefineLater(strToolContentID, true);
 	}
 	request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
 
@@ -132,7 +132,7 @@
 	prepareDTOandForm(request, mapping, mcAuthoringForm, new Long(strToolContentID).longValue(),
 		mcContent, mcGeneralAuthoringDTO, sessionMap);
 
-	List<McQuestionDTO> questionDtos = AuthoringUtil.buildDefaultQuestions(mcContent, mcService);
+	List<McQuestionDTO> questionDtos = AuthoringUtil.buildDefaultQuestions(mcContent);
 	request.setAttribute(TOTAL_QUESTION_COUNT, new Integer(questionDtos.size()));
 	request.setAttribute(LIST_QUESTION_DTOS, questionDtos);
 	sessionMap.put(LIST_QUESTION_DTOS, questionDtos);
@@ -180,7 +180,8 @@
 	    McAuthoringForm mcAuthoringForm, long toolContentID, McContent mcContent,
 	    McGeneralAuthoringDTO mcGeneralAuthoringDTO, SessionMap<String, Object> sessionMap) {
 
-	McUtils.populateAuthoringDTO(request, mcContent, mcGeneralAuthoringDTO);
+	mcGeneralAuthoringDTO.setActivityTitle(mcContent.getTitle());
+	mcGeneralAuthoringDTO.setActivityInstructions(mcContent.getInstructions());
 
 	mcAuthoringForm.setSln(mcContent.isShowReport() ? "1" : "0");
 	mcAuthoringForm.setQuestionsSequenced(mcContent.isQuestionsSequenced() ? "1" : "0");
Index: lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp
===================================================================
diff -u -r9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision 9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f)
+++ lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp	(.../AuthoringTabsHolder.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -84,8 +84,6 @@
         }
 	</script>
 </lams:head>
-
-
 <body onLoad="init();" class="stripes">
 
 <div id="page">
@@ -125,6 +123,5 @@
 
 </div>
 
-
 </body>
 </lams:html>
\ No newline at end of file
Index: lams_tool_lamc/web/authoring/BasicContent.jsp
===================================================================
diff -u -r9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f)
+++ lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -64,7 +64,7 @@
     	form.submit();
     }
     
-    function exportQTI(){
+    function exportQTI() {
     	var frame = document.getElementById("downloadFileDummyIframe"),
     		title = encodeURIComponent(document.getElementsByName("title")[0].value);
     	frame.src = '<html:rewrite page="/authoring.do?dispatch=exportQTI&httpSessionID=${mcGeneralAuthoringDTO.httpSessionID}" />'
Index: lams_tool_lamc/web/authoring/candidateAnswersList.jsp
===================================================================
diff -u -r9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/web/authoring/candidateAnswersList.jsp	(.../candidateAnswersList.jsp)	(revision 9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f)
+++ lams_tool_lamc/web/authoring/candidateAnswersList.jsp	(.../candidateAnswersList.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -83,18 +83,18 @@
 
 					<td class="align-center">
 
-							<c:forEach var="correctEntry" items="${mcGeneralAuthoringDTO.correctMap}">
-								<c:set var="SELECTED_ANSWER" scope="request" value="" />
-								<c:set var="ISCORRECT" scope="request" value="Incorrect" />
+						<c:forEach var="correctEntry" items="${mcGeneralAuthoringDTO.correctMap}">
+							<c:set var="SELECTED_ANSWER" scope="request" value="" />
+							<c:set var="ISCORRECT" scope="request" value="Incorrect" />
 								
-								<c:if test="${correctEntry.value == currentCandidateDTO.correct}">
-									<c:set var="SELECTED_ANSWER" scope="request" value="CHECKED" />
-									<c:set var="ISCORRECT" scope="request" value="Correct" />
-								</c:if>
+							<c:if test="${correctEntry.value == currentCandidateDTO.correct}">
+								<c:set var="SELECTED_ANSWER" scope="request" value="CHECKED" />
+								<c:set var="ISCORRECT" scope="request" value="Correct" />
+							</c:if>
 
-								<input type="radio" name="correct" value="<c:out value="${caIndex}"/>" <c:out value="${SELECTED_ANSWER}"/> >  
+							<input type="radio" name="correct" value="<c:out value="${caIndex}"/>" <c:out value="${SELECTED_ANSWER}"/> >  
 
-							</c:forEach>
+						</c:forEach>
 					</td>
 
 					<td>
Index: lams_tool_lamc/web/authoring/newQuestionBox.jsp
===================================================================
diff -u -r9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/web/authoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision 9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f)
+++ lams_tool_lamc/web/authoring/newQuestionBox.jsp	(.../newQuestionBox.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -147,8 +147,7 @@
 
 	<body class="stripes" onload="parent.resizeIframe();">
 		<div id="content" >
-		<html:form action="/authoring?validate=false"
-			styleId="newQuestionForm" enctype="multipart/form-data" method="POST">
+		<html:form action="/authoring?validate=false" styleId="newQuestionForm" enctype="multipart/form-data" method="POST">
 			<html:hidden property="dispatch" value="addSingleQuestion" />
 			<html:hidden property="currentField" />			
 			<html:hidden property="toolContentID" />
@@ -178,22 +177,20 @@
 					</html:button>
 				</div>
 				<div id="questions-worth">
-				<fmt:message key="label.questions.worth"></fmt:message>
-				<select name="mark">
-					<c:forEach var="markEntry"
-						items="${mcGeneralAuthoringDTO.marksMap}">
-						<c:set var="SELECTED_MARK" scope="request" value="" />
-						<c:if test="${markEntry.value == mcGeneralAuthoringDTO.markValue}">
-							<c:set var="SELECTED_MARK" scope="request" value="SELECTED" />
-						</c:if>
-
-						<option value="<c:out value="${markEntry.value}"/>"
-							<c:out value="${SELECTED_MARK}"/>>
-							<c:out value="${markEntry.value}" />
-						</option>
-					</c:forEach>
-				</select>
-				<fmt:message key="label.marks"></fmt:message>
+					<fmt:message key="label.questions.worth"></fmt:message>
+					<select name="mark">
+						<c:forEach var="markEntry" items="${mcGeneralAuthoringDTO.marksMap}">
+							<c:set var="SELECTED_MARK" scope="request" value="" />
+							<c:if test="${markEntry.value == mcGeneralAuthoringDTO.markValue}">
+								<c:set var="SELECTED_MARK" scope="request" value="SELECTED" />
+							</c:if>
+	
+							<option value="<c:out value="${markEntry.value}"/>" <c:out value="${SELECTED_MARK}"/>>
+								<c:out value="${markEntry.value}" />
+							</option>
+						</c:forEach>
+					</select>
+					<fmt:message key="label.marks"></fmt:message>
 				</div>
 			</div>
 
@@ -203,8 +200,7 @@
 			<html:textarea property="feedback" rows="3" cols="70"></html:textarea>
 			
 			<lams:ImgButtonWrapper>
-					<a href="#" onclick="addItem();"				
-						onmousedown="self.focus();" class="button-add-item"> 
+					<a href="#" onclick="addItem();" onmousedown="self.focus();" class="button-add-item"> 
 						<fmt:message key="label.add.new.question" />
 					</a>
 	
Index: lams_tool_lamc/web/export/class.jsp
===================================================================
diff -u -r7e6ebfd5557305fbb05f12d799297e25c2d02084 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/web/export/class.jsp	(.../class.jsp)	(revision 7e6ebfd5557305fbb05f12d799297e25c2d02084)
+++ lams_tool_lamc/web/export/class.jsp	(.../class.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -1,114 +1,124 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-	<table>				
- 	 		<tr>
-		  	<th scope="col" valign=top> 
-			    <fmt:message key="label.mcqSummary"/> 
-		  	</th>
- 	 		</tr>
+<table>				
+ 	<tr>
+		<th scope="col" valign=top> 
+			<fmt:message key="label.mcqSummary"/> 
+		</th>
+	</tr>
 		
-		
- 	 		<c:set var="queIndex" scope="request" value="0"/>
-		<c:forEach var="currentDto" items="${listMonitoredAnswersContainerDto}">
+	<c:set var="queIndex" scope="request" value="0"/>
+	<c:forEach var="currentDto" items="${listMonitoredAnswersContainerDto}">
 		<c:set var="queIndex" scope="request" value="${queIndex +1}"/>
-  	 		<c:set var="currentQuestionId" scope="request" value="${currentDto.questionUid}"/>
-  	 		<tr>
-  	 			<td>&nbsp;</td>
-  	 		</tr>
-			<tr>			
-				<td NOWRAP valign=top class="align-left"><b>  <fmt:message key="label.question.only"/> <c:out value="${queIndex}"/>:</b>
-					<c:out value="${currentDto.question}" escapeXml="false"/> &nbsp; (<fmt:message key="label.mark"/> 
-					<c:out value="${currentDto.mark}"/>)
-				 </td>
-			</tr>	
-			<tr>					
-				<td NOWRAP valign=top class="align-left">  <b> <fmt:message key="label.mc.options.col"/>  </b> 
-					<table class="align-left">
-						<c:forEach var="answersData" items="${currentDto.candidateAnswersCorrect}">
-							<tr>			
-								<td NOWRAP valign=top class="align-left">
-									<c:out value="${answersData.candidateAnswer}" escapeXml="false"/> 
+  	 	<c:set var="currentQuestionId" scope="request" value="${currentDto.questionUid}"/>
+  	 	
+  	 	<tr>
+  	 		<td>&nbsp;</td>
+  	 	</tr>
+  	 	
+		<tr>			
+			<td NOWRAP valign=top class="align-left"><b>  <fmt:message key="label.question.only"/> <c:out value="${queIndex}"/>:</b>
+				<c:out value="${currentDto.question}" escapeXml="false"/> &nbsp; (<fmt:message key="label.mark"/> 
+				<c:out value="${currentDto.mark}"/>)
+			</td>
+		</tr>
+		
+		<tr>					
+			<td NOWRAP valign=top class="align-left">  <b> <fmt:message key="label.mc.options.col"/>  </b> 
+				<table class="align-left">
+					<c:forEach var="answersData" items="${currentDto.candidateAnswersCorrect}">
+						<tr>			
+							<td NOWRAP valign=top class="align-left">
+								<c:out value="${answersData.candidateAnswer}" escapeXml="false"/> 
 									
-									<c:if test="${answersData.correct == 'true'}"> 		
-										&nbsp; (<fmt:message key="label.correct"/>)
-									</c:if>																
-								</td>	
-							</tr>
-						</c:forEach>		  	
-					</table>
-				</td>  
-			</tr>			
+								<c:if test="${answersData.correct == 'true'}"> 		
+									&nbsp; (<fmt:message key="label.correct"/>)
+								</c:if>																
+							</td>	
+						</tr>
+					</c:forEach>		  	
+				</table>
+			</td>  
+		</tr>			
 
-		</c:forEach>		  	
+	</c:forEach>		  	
 
- 	 		<tr>
- 	 			<td NOWRAP valign=top class="align-left"> <b> 
- 	 				<fmt:message key="label.passingMark"/> </b> <c:out value="${passMark}"/>  
- 	 			</td>
- 	 		</tr>
+ 	 <tr>
+ 	 	<td NOWRAP valign=top class="align-left"> <b> 
+ 	 		<fmt:message key="label.passingMark"/> </b> <c:out value="${passMark}"/>  
+ 	 	</td>
+ 	 </tr>
  	 		
-	</table>
+</table>
 
-
-	 <h2>    <fmt:message key="label.studentMarks"/>  </h2>
-	 <c:if test="${portfolioExportDataFileName != null}">
-	 	<p><html:link href="${portfolioExportDataFileName }"><c:out value="${portfolioExportDataFileName}"/></html:link></p>
-	 </c:if>
-		<table class="forms">
+<h2>    <fmt:message key="label.studentMarks"/>  </h2>
+	 
+<c:if test="${portfolioExportDataFileName != null}">
+	<p><html:link href="${portfolioExportDataFileName }"><c:out value="${portfolioExportDataFileName}"/></html:link></p>
+</c:if>
+	 
+<table class="forms">
 		
-			<c:forEach var="sessionMarksDto" items="${listMonitoredMarksContainerDto}">
-	  	 		<c:set var="currentSessionId" scope="request" value="${sessionMarksDto.sessionId}"/>
-	  	 		<c:set var="mapUserMarksDto" scope="request" value="${sessionMarksDto.userMarks}"/>
+	<c:forEach var="sessionMarksDto" items="${listMonitoredMarksContainerDto}">
+		<c:set var="currentSessionId" scope="request" value="${sessionMarksDto.sessionId}"/>
+		<c:set var="mapUserMarksDto" scope="request" value="${sessionMarksDto.userMarks}"/>
 
-				<tr>
-			 		<td NOWRAP colspan=2 > <b> <fmt:message key="group.label"/> : </b>
-			 		<c:out value="${sessionMarksDto.sessionName}"/>  </td>
-				</tr>
+		<tr>
+			<td NOWRAP colspan=2 > <b> <fmt:message key="group.label"/> : </b>
+			<c:out value="${sessionMarksDto.sessionName}"/>  </td>
+		</tr>
 
-
-	  	 		<tr>
-					 <td NOWRAP valign=top class="align-left"> <b> <fmt:message key="label.user"/> </b> </td>  
-		  	 		<c:set var="queIndex" scope="request" value="0"/>
-					<c:forEach var="currentDto" items="${listMonitoredAnswersContainerDto}">
-					<c:set var="queIndex" scope="request" value="${queIndex +1}"/>
-						<td valign=top class="align-left"> <b>  <fmt:message key="label.question.only"/> 
-							<c:out value="${queIndex}"/></b></td>
-					</c:forEach>		  	
+		<tr>
+			<td NOWRAP valign=top class="align-left"> 
+				<b> <fmt:message key="label.user"/> </b> 
+			</td>
+			  
+		  	<c:set var="queIndex" scope="request" value="0"/>
+			<c:forEach var="currentDto" items="${listMonitoredAnswersContainerDto}">
+				<c:set var="queIndex" scope="request" value="${queIndex +1}"/>
+				<td valign=top class="align-left"> <b>  <fmt:message key="label.question.only"/> 
+					<c:out value="${queIndex}"/></b>
+				</td>
+			</c:forEach>		  	
 					 
-					 <td NOWRAP valign=top class="align-left"> <b> <fmt:message key="label.total"/>  </b> </td>  
-		  	 		</tr>						 
+			<td NOWRAP valign=top class="align-left"> 
+				<b> <fmt:message key="label.total"/>  </b> 
+			</td>  
+		</tr>						 
 
-							<c:forEach var="markData" items="${mapUserMarksDto}">						
-				  	 		<c:set var="data" scope="request" value="${markData.value}"/>
-				  	 		<c:set var="currentUserSessionId" scope="request" value="${data.sessionId}"/>
+		<c:forEach var="markData" items="${mapUserMarksDto}">						
+			<c:set var="data" scope="request" value="${markData.value}"/>
+			<c:set var="currentUserSessionId" scope="request" value="${data.sessionId}"/>
 
-								<c:if test="${currentUserSessionId == currentSessionId}"> 	
-									<tr>									  	 		
-					  	 				<td NOWRAP valign=top class="align-left"> 
-												<c:out value="${data.fullName}"/> 
-										</td>	
+			<c:if test="${currentUserSessionId == currentSessionId}"> 	
+				<tr>									  	 		
+					<td NOWRAP valign=top class="align-left"> 
+						<c:out value="${data.fullName}"/> 
+					</td>	
 	
-										<c:forEach var="mark" items="${data.marks}">
-											<td NOWRAP valign=top class="align-left"> 
-													<c:out value="${mark}"/> 								
-											</td>
-										</c:forEach>		  										
+					<c:forEach var="mark" items="${data.marks}">
+						<td NOWRAP valign=top class="align-left"> 
+							<c:out value="${mark}"/> 								
+						</td>
+					</c:forEach>		  										
 	
-										<td NOWRAP valign=top class="align-left"> 
-													<c:out value="${data.totalMark}"/> 																
-										</td>							
-									</tr>													
-								</c:if>																
+					<td NOWRAP valign=top class="align-left"> 
+						<c:out value="${data.totalMark}"/> 																
+					</td>							
+				</tr>													
+			</c:if>																
 
-							</c:forEach>		  	
-	
+		</c:forEach>	
 
- 					<tr> <td NOWRAP colspan="<c:out value='${hrColumnCount}'/>">  </td>
-					</tr>
- 					<tr> <td NOWRAP colspan="<c:out value='${hrColumnCount}'/>"> <hr size="2"></td>
-					</tr>
- 					<tr> <td NOWRAP colspan="<c:out value='${hrColumnCount}'/>">  </td>
-					</tr>
-			</c:forEach>		  	
-	</table>		  	 		
+ 		<tr> 
+ 			<td NOWRAP colspan="<c:out value='${hrColumnCount}'/>">  </td>
+		</tr>
+ 		<tr> 
+ 			<td NOWRAP colspan="<c:out value='${hrColumnCount}'/>"> <hr size="2"></td>
+		</tr>
+ 		<tr> 
+ 			<td NOWRAP colspan="<c:out value='${hrColumnCount}'/>">  </td>
+		</tr>
+	</c:forEach>		  	
+</table>		  	 		
 	
\ No newline at end of file
Index: lams_tool_lamc/web/export/exportportfolio.jsp
===================================================================
diff -u -rc369c0326857e08851d03a29d39d4337091f5253 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/web/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision c369c0326857e08851d03a29d39d4337091f5253)
+++ lams_tool_lamc/web/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
 
@@ -18,41 +17,34 @@
 			<div id="content">
 		
 			<h1>
-			<c:if test="${(portfolioExportMode == 'learner')}"><fmt:message key="label.export.learner"/></c:if>			
-			<c:if test="${(portfolioExportMode != 'learner')}"><fmt:message key="label.export.teacher"/></c:if>			
+				<c:if test="${(portfolioExportMode == 'learner')}"><fmt:message key="label.export.learner"/></c:if>			
+				<c:if test="${(portfolioExportMode != 'learner')}"><fmt:message key="label.export.teacher"/></c:if>			
 	        </h1>
 
-				<c:if test="${(userExceptionNoToolSessions == 'true')}"> 	
-				<c:if test="${(portfolioExportMode != 'learner')}">
-						<h2> <fmt:message key="error.noLearnerActivity"/> </h2>
+				<c:if test="${(userExceptionNoToolSessions == 'true') && (portfolioExportMode != 'learner')}"> 
+					<h2> <fmt:message key="error.noLearnerActivity"/> </h2>
 				</c:if>			
-				</c:if>			
 		
 				<c:if test="${(userExceptionNoToolSessions != 'true') }"> 	
 					<c:choose> 
-					  <c:when test="${(portfolioExportMode != 'learner')}" > 
+						<c:when test="${(portfolioExportMode != 'learner')}" > 
 							<jsp:include page="/export/class.jsp" /> 
-					  </c:when> 
-					  <c:otherwise>
+					  	</c:when> 
+					  	<c:otherwise>
 							<c:if test="${not empty  listMonitoredAnswersContainerDto}"> 
-							<jsp:include page="/export/learner.jsp" /> 
+								<jsp:include page="/export/learner.jsp" /> 
 							</c:if>
-					  </c:otherwise>
+					  	</c:otherwise>
 					</c:choose> 
 
 			  	  	<jsp:include page="/export/reflections.jsp" />  
 				</c:if>						
 		
-			</div>  <!--closes content-->
+			</div>  <!--closes content-->		
 		
+			<div id="footer"></div><!--closes footer-->
 		
-			<div id="footer">
-			</div><!--closes footer-->
-		
 		</html:form>	
 
 	</body>
 </lams:html>
-
-
-
Index: lams_tool_lamc/web/export/learner.jsp
===================================================================
diff -u -rc369c0326857e08851d03a29d39d4337091f5253 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/web/export/learner.jsp	(.../learner.jsp)	(revision c369c0326857e08851d03a29d39d4337091f5253)
+++ lams_tool_lamc/web/export/learner.jsp	(.../learner.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -1,70 +1,72 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-	<table width="80%" cellspacing="8" align="center">
+<table width="80%" cellspacing="8" align="center">
  	 	<c:set var="mainQueIndex" scope="request" value="0"/>
 		<c:forEach var="currentDto" items="${listMonitoredAnswersContainerDto}">
 		<c:set var="mainQueIndex" scope="request" value="${mainQueIndex +1}"/>
-  	 		<c:set var="currentQuestionId" scope="request" value="${currentDto.questionUid}"/>
-  	 		<tr>
-  	 			<td> &nbsp;</td>
-  	 		</tr>
-			<tr>			
-				<td NOWRAP valign=top class="align-left"><b>  <fmt:message key="label.question.only"/> <c:out value="${mainQueIndex}"/>:</b>
-					<c:out value="${currentDto.question}"  escapeXml="false"/> &nbsp; (<fmt:message key="label.mark"/> 
-					<c:out value="${currentDto.mark}"/>)
-				 </td>
-			</tr>	
-			<tr>					
-				<td NOWRAP valign=top class="align-left">  <b> <fmt:message key="label.mc.options.col"/>  </b> 
-					<table class="align-left">
-						<c:forEach var="answersData" items="${currentDto.candidateAnswersCorrect}">
-							<tr>			
-								<td NOWRAP valign=top class="align-left">
-									<c:out value="${answersData.candidateAnswer}"  escapeXml="false"/> 
+  	 	<c:set var="currentQuestionId" scope="request" value="${currentDto.questionUid}"/>
+  	 	<tr>
+  	 		<td> &nbsp;</td>
+  	 	</tr>
+  	 	
+		<tr>			
+			<td NOWRAP valign=top class="align-left">
+				<b>  <fmt:message key="label.question.only"/> <c:out value="${mainQueIndex}"/>:</b>
+				<c:out value="${currentDto.question}"  escapeXml="false"/> &nbsp; (<fmt:message key="label.mark"/> 
+				<c:out value="${currentDto.mark}"/>)
+			</td>
+		</tr>
+			
+		<tr>					
+			<td NOWRAP valign=top class="align-left">  <b> <fmt:message key="label.mc.options.col"/>  </b> 
+				<table class="align-left">
+					<c:forEach var="answersData" items="${currentDto.candidateAnswersCorrect}">
+						<tr>			
+							<td NOWRAP valign=top class="align-left">
+								<c:out value="${answersData.candidateAnswer}"  escapeXml="false"/> 
 									
-									<c:if test="${answersData.correct == 'true'}"> 		
-										&nbsp; (<fmt:message key="label.correct"/>)
-									</c:if>																		
-								</td>	
-							</tr>
-						</c:forEach>		  	
-					</table>
-				</td>  
-			</tr>			
+								<c:if test="${answersData.correct == 'true'}"> 		
+									&nbsp; (<fmt:message key="label.correct"/>)
+								</c:if>																		
+							</td>	
+						</tr>
+					</c:forEach>		  	
+				</table>
+			</td>  
+		</tr>			
 
-	 		<tr>
-				<%--  only expect one entry for the following two maps as it is one entry per session and then one per user --%>
-				<td  NOWRAP class="align-left" valign=top> 											
-				<table class="align-left">
-					<c:forEach var="sessionEntry" items="${currentDto.questionAttempts}">
-				 	<c:forEach var="userEntry" items="${sessionEntry.value}">
-			 		<tr>
-						<td NOWRAP class="align-left" valign=top><b> <fmt:message key="label.yourAnswers"/>  </b></td>
-						<td align=right valign=top>(<c:out value="${userEntry.mark}"/>)</td>
+		<tr>
+			<%--  only expect one entry for the following two maps as it is one entry per session and then one per user --%>
+			<td  NOWRAP class="align-left" valign=top> 											
+			<table class="align-left">
+				<c:forEach var="sessionEntry" items="${currentDto.questionAttempts}">
+					<c:forEach var="userEntry" items="${sessionEntry.value}">
+					 	<tr>
+							<td NOWRAP class="align-left" valign=top><b> <fmt:message key="label.yourAnswers"/>  </b></td>
+							<td align=right valign=top>(<c:out value="${userEntry.mark}"/>)</td>
 						</tr>
-						 <tr>
+						<tr>
 							<td NOWRAP class="align-left" valign=top>
 								<fmt:message key="label.attempt"/> <c:out value="${userEntry.userAnswer}"/>
 							</td>
-						 </tr>
+						</tr>
 					</c:forEach>	
-					</c:forEach>			
+				</c:forEach>			
 				</table>
 				</td>
-		  </tr>								
+		</tr>								
 
-		</c:forEach>
+	</c:forEach>
 
- 	 		<tr>
- 	 			<td NOWRAP valign=top class="align-left"> <b> 
- 	 				<fmt:message key="label.passingMark"/>: </b> <c:out value="${passMark}"/> 
- 	 			</td>
- 	 		</tr>
+	<tr>
+		<td NOWRAP valign=top class="align-left"> <b> 
+			<fmt:message key="label.passingMark"/>: </b> <c:out value="${passMark}"/> 
+		</td>
+	</tr>
 
-
- 	 		<tr>
- 	 			<td NOWRAP valign=top class="align-left"> <b> 
- 	 				<fmt:message key="label.studentMark"/>: </b> <c:out value="${learnerMark}"/> 
- 	 			</td>
- 	 		</tr>
-	</table>					
\ No newline at end of file
+	<tr>
+		<td NOWRAP valign=top class="align-left"> <b> 
+			<fmt:message key="label.studentMark"/>: </b> <c:out value="${learnerMark}"/> 
+		</td>
+	</tr>
+</table>					
\ No newline at end of file
Index: lams_tool_lamc/web/export/reflections.jsp
===================================================================
diff -u -rf04e5eaf5a3b6bd01c39426e993609857686d936 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/web/export/reflections.jsp	(.../reflections.jsp)	(revision f04e5eaf5a3b6bd01c39426e993609857686d936)
+++ lams_tool_lamc/web/export/reflections.jsp	(.../reflections.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -1,45 +1,45 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-		<table  class="forms">
+<table  class="forms">
 		
+	<tr>			
+		<td valign=top class="align-left">
+			&nbsp
+		</td>
+	</tr>
+		
+	<tr>			
+		<td valign=top class="align-left">
+			<table class="align-left">
+						
 				<tr>			
-					<td valign=top class="align-left">
-						&nbsp
+					<td colspan=3 valign=top align=center>
+						<b>  <fmt:message key="label.reflection"/>  </b> 
 					</td>
 				</tr>
-		
-			<tr>			
-					<td valign=top class="align-left">
-						<table class="align-left">
 						
-								<tr>			
-									<td colspan=3 valign=top align=center>
-										<b>  <fmt:message key="label.reflection"/>  </b> 
-									 </td>
-								</tr>	
-						
-						
-							<c:forEach var="currentDto" items="${reflectionsContainerDTO}">
-					  	 		<c:set var="userName" scope="request" value="${currentDto.userName}"/>
-					  	 		<c:set var="userId" scope="request" value="${currentDto.userId}"/>
-					  	 		<c:set var="sessionId" scope="request" value="${currentDto.sessionId}"/>
-					  	 		<c:set var="reflectionUid" scope="request" value="${currentDto.reflectionUid}"/>
-					  	 		<c:set var="entry" scope="request" value="${currentDto.entry}"/>
-								<tr>			
-									<td valign=top class="align-left">
-										<b> <fmt:message key="label.user"/>:</b>
-									 </td>
+				<c:forEach var="currentDto" items="${reflectionsContainerDTO}">
+					<c:set var="userName" scope="request" value="${currentDto.userName}"/>
+					<c:set var="userId" scope="request" value="${currentDto.userId}"/>
+					<c:set var="sessionId" scope="request" value="${currentDto.sessionId}"/>
+					<c:set var="reflectionUid" scope="request" value="${currentDto.reflectionUid}"/>
+					<c:set var="entry" scope="request" value="${currentDto.entry}"/>
+					
+					<tr>			
+						<td valign=top class="align-left">
+							<b> <fmt:message key="label.user"/>:</b>
+						</td>
 								
-									<td valign=top class="align-left">
-										 <c:out value="${userName}" escapeXml="false"/> 
-									 </td>
+						<td valign=top class="align-left">
+							<c:out value="${userName}" escapeXml="false"/> 
+						</td>
 
-									<td valign=top class="align-left">
-										 <c:out value="${entry}" escapeXml="false"/> 
-									 </td>
-								</tr>	
-							</c:forEach>		
-						</table>  	
-					 </td>
-				</tr>	
-		</table>	
\ No newline at end of file
+						<td valign=top class="align-left">
+							<c:out value="${entry}" escapeXml="false"/> 
+						</td>
+					</tr>	
+				</c:forEach>		
+			</table>  	
+		</td>
+	</tr>	
+</table>	
\ No newline at end of file
Index: lams_tool_lamc/web/learning/AnswersContent.jsp
===================================================================
diff -u -r816baa75867795676ea15c9dfcc4feef712edc47 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 816baa75867795676ea15c9dfcc4feef712edc47)
+++ lams_tool_lamc/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
 
@@ -31,47 +30,49 @@
 	
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.form.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>	
+	<link href="jquery.jgrowl.min.css" rel="stylesheet"/>
+
+	<script type="text/javascript" src="jquery.jgrowl.min.js"></script>	
 	<script language="JavaScript" type="text/JavaScript">
 
 		//autoSaveAnswers if hasEditRight
 		if (${hasEditRight}) {
-			var interval = "30000"; // = 30 seconds
+			var interval = "5000"; // = 30 seconds
 			window.setInterval(
 				function(){
 					//ajax form submit
 					$('#learningForm').ajaxSubmit({
 						url: "<c:url value='/learning.do?method=autoSaveAnswers&date='/>" + new Date().getTime(),
 		                success: function() {
-		                	$.growlUI('<fmt:message key="label.learning.draft.autosaved" />');
+		                	$.jGrowl('<fmt:message key="label.learning.draft.autosaved" />');
 		                }
 					});
 	        	}, interval
 	        );
 		}
 			
-			function submitNextQuestionSelected() {
-				if (verifyAllQuestionsAnswered()) {
-					++document.McLearningForm.questionIndex.value;
-					document.McLearningForm.nextQuestionSelected.value = 1;
-					disableContinueButton();
-					document.McLearningForm.submit();
-				}
+		function submitNextQuestionSelected() {
+			if (verifyAllQuestionsAnswered()) {
+				++document.McLearningForm.questionIndex.value;
+				document.McLearningForm.nextQuestionSelected.value = 1;
+				disableContinueButton();
+				document.McLearningForm.submit();
 			}
+		}
 
-			function submitAllAnswers() {
-				document.McLearningForm.continueOptionsCombined.value = 1;			
-				doSubmit();
-			}
+		function submitAllAnswers() {
+			document.McLearningForm.continueOptionsCombined.value = 1;			
+			doSubmit();
+		}
 			
-			function doSubmit() {
-				if (verifyAllQuestionsAnswered()) {
-					disableContinueButton();
-					document.McLearningForm.submit();
-				}
+		function doSubmit() {
+			if (verifyAllQuestionsAnswered()) {
+				disableContinueButton();
+				document.McLearningForm.submit();
 			}
+		}
 
-			function verifyAllQuestionsAnswered() {
+		function verifyAllQuestionsAnswered() {
 				// in case oneQuestionPerPage option is ON user has to select 1 answer, and all answers otherwise
 				var isOneQuestionPerPage = ${mcGeneralLearnerFlowDTO.questionListingMode == 'questionListingModeSequential'};
 				var answersRequiredNumber = (isOneQuestionPerPage) ? 1 : ${fn:length(requestScope.learnerAnswersDTOList)};
@@ -85,36 +86,36 @@
 					alert(msg);
 					return false;
 				}
-			}
+		}
 			
-			function disableContinueButton() {
-				var elem = document.getElementById("continueButton");
-				if (elem != null) {
-					elem.disabled = true;
-				}				
-			}
+		function disableContinueButton() {
+			var elem = document.getElementById("continueButton");
+			if (elem != null) {
+				elem.disabled = true;
+			}				
+		}
 			
-			if (${!hasEditRight && mode != "teacher"}) {
-				setInterval("checkLeaderProgress();",60000);// Auto-Refresh every 1 minute for non-leaders
-			}
+		if (${!hasEditRight && mode != "teacher"}) {
+			setInterval("checkLeaderProgress();",60000);// Auto-Refresh every 1 minute for non-leaders
+		}
 			
-			function checkLeaderProgress() {
+		function checkLeaderProgress() {
 				
-		        $.ajax({
-		        	async: false,
-		            url: '<c:url value="/learning.do"/>',
-		            data: 'method=checkLeaderProgress&toolSessionID=' + $("#tool-session-id").val(),
-		            dataType: 'json',
-		            type: 'post',
-		            success: function (json) {
-		            	if (json.isLeaderResponseFinalized) {
-		            		location.reload();
-		            	}
-		            }
-		       	});
-			}
+			$.ajax({
+				async: false,
+		    	url: '<c:url value="/learning.do"/>',
+		    	data: 'method=checkLeaderProgress&toolSessionID=' + $("#tool-session-id").val(),
+		    	dataType: 'json',
+		    	type: 'post',
+		    	success: function (json) {
+		        	if (json.isLeaderResponseFinalized) {
+		        		location.reload();
+		        	}
+		        }
+			});
+		}
 			
-		</script>
+	</script>
 </lams:head>
 
 <body class="stripes">
@@ -160,5 +161,4 @@
 <div id="footer"></div>
 
 </body>
-</lams:html>
-	
+</lams:html>	
Index: lams_tool_lamc/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -r816baa75867795676ea15c9dfcc4feef712edc47 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 816baa75867795676ea15c9dfcc4feef712edc47)
+++ lams_tool_lamc/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
 
@@ -38,8 +37,7 @@
 			<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}" escapeXml="true" />
 		</h1>
 
-		<html:form action="/learning?method=displayMc&validate=false"
-			method="POST" target="_self" onsubmit="disableFinishButton();"  styleId="Form1">
+		<html:form action="/learning?method=displayMc&validate=false" method="POST" target="_self" onsubmit="disableFinishButton();"  styleId="Form1">
 			<html:hidden property="toolContentID" />
 			<html:hidden property="toolSessionID" />
 			<html:hidden property="httpSessionID" />
@@ -50,22 +48,18 @@
 			<html:hidden property="learnerProgressUserId" />
 			<html:hidden property="questionListingMode" />
 
-
 			<c:choose>
-			<c:when test="${mcGeneralLearnerFlowDTO.retries == 'true'}">
-
-				<h3>
-					<fmt:message key="label.individual.results.withRetries" />
-				</h3>
-
-			</c:when>
-			<c:when test="${mcGeneralLearnerFlowDTO.retries != 'true'}">
-
-				<h3>
-					<fmt:message key="label.individual.results.withoutRetries" />
-				</h3>
-
-			</c:when>
+				<c:when test="${mcGeneralLearnerFlowDTO.retries == 'true'}">
+					<h3>
+						<fmt:message key="label.individual.results.withRetries" />
+					</h3>
+				</c:when>
+				
+				<c:when test="${mcGeneralLearnerFlowDTO.retries != 'true'}">
+					<h3>
+						<fmt:message key="label.individual.results.withoutRetries" />
+					</h3>
+				</c:when>
 			</c:choose>
 			
 			<c:if test="${(mcGeneralLearnerFlowDTO.retries == 'true') or (mcGeneralLearnerFlowDTO.displayAnswers == 'true')}">
@@ -78,22 +72,21 @@
 			</c:if>
 			
 			<p>
-				<c:if test="${mcGeneralLearnerFlowDTO.retries == 'true'}">
-					<c:if test="${mcGeneralLearnerFlowDTO.userOverPassMark != 'true' && 
-									mcGeneralLearnerFlowDTO.passMarkApplicable == 'true' }">
+				<c:if test="${mcGeneralLearnerFlowDTO.retries == 'true'
+					&& mcGeneralLearnerFlowDTO.userOverPassMark != 'true'
+					&& mcGeneralLearnerFlowDTO.passMarkApplicable == 'true'}">
 
-						<fmt:message key="label.notEnoughMarks">
-							<fmt:param>
-								<c:if test="${mcGeneralLearnerFlowDTO.passMark != mcGeneralLearnerFlowDTO.totalMarksPossible}">
-									<fmt:message key="label.atleast" />
-								</c:if>
-								<c:out value="${mcGeneralLearnerFlowDTO.passMark}" />
-								<fmt:message key="label.outof" />
-								<c:out value="${mcGeneralLearnerFlowDTO.totalMarksPossible}" />
-							</fmt:param>
-						</fmt:message>
-
-					</c:if>
+					<fmt:message key="label.notEnoughMarks">
+						<fmt:param>
+							<c:if test="${mcGeneralLearnerFlowDTO.passMark != mcGeneralLearnerFlowDTO.totalMarksPossible}">
+								<fmt:message key="label.atleast" />
+							</c:if>
+								
+							<c:out value="${mcGeneralLearnerFlowDTO.passMark}" />
+							<fmt:message key="label.outof" />
+							<c:out value="${mcGeneralLearnerFlowDTO.totalMarksPossible}" />
+						</fmt:param>
+					</fmt:message>
 				</c:if>
 			</p>
 
@@ -120,24 +113,25 @@
 						</c:if>
 					</div>		
 
-						<p>
-							<c:out value="${dto.answerOption.mcQueOptionText}" escapeXml="false" />
+					<p>
+						<c:out value="${dto.answerOption.mcQueOptionText}" escapeXml="false" />
 								
-                    		<c:if test="${mcGeneralLearnerFlowDTO.displayAnswers == 'true'}">
-								<c:if test="${dto.attemptCorrect == 'true'}">
-									<img src="<c:out value="${tool}"/>images/tick.gif" border="0" class="middle">
-								</c:if>
-								<c:if test="${dto.attemptCorrect != 'true'}">
-									<img src="<c:out value="${tool}"/>images/cross.gif" border="0" class="middle">
-								</c:if>
+                    	<c:if test="${mcGeneralLearnerFlowDTO.displayAnswers == 'true'}">
+							<c:if test="${dto.attemptCorrect == 'true'}">
+								<img src="<c:out value="${tool}"/>images/tick.gif" border="0" class="middle">
 							</c:if>
-						</p>
+							<c:if test="${dto.attemptCorrect != 'true'}">
+								<img src="<c:out value="${tool}"/>images/cross.gif" border="0" class="middle">
+							</c:if>
+						</c:if>
+					</p>
 
-						<c:if test="${(dto.feedback != null) && (dto.feedback != '')}">
-							<div style="overflow: auto;">
-								<strong> <fmt:message key="label.feedback.simple" /> </strong> <c:out value="${dto.feedback}" escapeXml="true" /> 
-							</div>		
-						</c:if>	
+					<c:if test="${(dto.feedback != null) && (dto.feedback != '')}">
+						<div style="overflow: auto;">
+							<strong> <fmt:message key="label.feedback.simple" /> </strong> 
+							<c:out value="${dto.feedback}" escapeXml="true" /> 
+						</div>		
+					</c:if>	
 				</div>
 			</c:forEach>
 
@@ -147,28 +141,26 @@
 				</h4>
 				
 				<table class="alternative-color" cellspacing="0">
-				  <tr>
-				  	<td width="30%"> 
-					  	  <strong> <fmt:message key="label.topMark"/> </strong>
-					 </td> 
-					 <td>	
-						  	 <c:out value="${mcGeneralLearnerFlowDTO.topMark}"/>
-				  	</td>
-				  </tr>	
+					<tr>
+				  		<td width="30%"> 
+							<strong> <fmt:message key="label.topMark"/> </strong>
+						</td> 
+						<td>	
+							<c:out value="${mcGeneralLearnerFlowDTO.topMark}"/>
+				  		</td>
+					</tr>	
 	
-				  <tr>
-				  	<td> 
-					  	 <strong><fmt:message key="label.avMark"/> </strong>
-				  	</td>
-				  	<td>
-						  	<c:out value="${mcGeneralLearnerFlowDTO.averageMark}"/>
-				  	</td>
-				  </tr>	
+				  	<tr>
+				  		<td> 
+					  		<strong><fmt:message key="label.avMark"/> </strong>
+				  		</td>
+				  		<td>
+							<c:out value="${mcGeneralLearnerFlowDTO.averageMark}"/>
+				  		</td>
+					</tr>	
 				</table>
-			</c:if>				
-			
+			</c:if>	
 
-
 			<c:if test="${mcGeneralLearnerFlowDTO.retries == 'true'}">
 				<p>
 					<fmt:message key="label.learner.bestMark"/>
@@ -180,38 +172,11 @@
 				<html:submit property="redoQuestions" styleClass="button">
 					<fmt:message key="label.redo.questions" />
 				</html:submit>
-
-				<div class="space-bottom-top align-right">
-					<c:if
-						test="${((mcGeneralLearnerFlowDTO.passMarkApplicable == 'true') && (mcGeneralLearnerFlowDTO.userOverPassMark == 'true'))}">
-						<c:if test="${mcGeneralLearnerFlowDTO.reflection != 'true'}">
-							<html:hidden property="learnerFinished" value="Finished" />
-							
-							<html:link href="#" styleClass="button" styleId="finishButton"  onclick="submitForm('finish');return false">
-								<span class="nextActivity">
-									<c:choose>
-					 					<c:when test="${activityPosition.last}">
-					 						<fmt:message key="label.submit" />
-					 					</c:when>
-					 					<c:otherwise>
-					 		 				<fmt:message key="label.finished" />
-					 					</c:otherwise>
-						 			</c:choose>
-						 		</span>
-							</html:link>
-						</c:if>
-
-						<c:if test="${mcGeneralLearnerFlowDTO.reflection == 'true'}">
-							<html:submit property="forwardtoReflection" styleClass="button">
-								<fmt:message key="label.continue" />
-							</html:submit>
-						</c:if>
-					</c:if>
-				</div>
-
 			</c:if>
 
-			<c:if test="${mcGeneralLearnerFlowDTO.retries != 'true'}">
+			<c:if test="${(mcGeneralLearnerFlowDTO.retries != 'true')
+				|| (mcGeneralLearnerFlowDTO.retries == 'true') && (mcGeneralLearnerFlowDTO.passMarkApplicable == 'true') 
+				&& (mcGeneralLearnerFlowDTO.userOverPassMark == 'true')}">
 
 				<div class="space-bottom-top align-right">
 					<c:if test="${mcGeneralLearnerFlowDTO.reflection != 'true'}">
Index: lams_tool_lamc/web/learning/Notebook.jsp
===================================================================
diff -u -r816baa75867795676ea15c9dfcc4feef712edc47 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 816baa75867795676ea15c9dfcc4feef712edc47)
+++ lams_tool_lamc/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -20,8 +20,7 @@
 
 <body class="stripes">
 
-	<html:form action="/learning?method=displayMc&validate=false"
-		styleId="reflectionForm" method="POST">
+	<html:form action="/learning?method=displayMc&validate=false" styleId="reflectionForm" method="POST">
 		<html:hidden property="toolContentID" />
 		<html:hidden property="toolSessionID" />
 		<html:hidden property="httpSessionID" />
@@ -33,39 +32,25 @@
 				<c:out value="${mcGeneralLearnerFlowDTO.activityTitle}" escapeXml="true" />
 			</h1>
 
-
-
 			<p>
 				<lams:out value="${mcGeneralLearnerFlowDTO.reflectionSubject}" escapeHtml="true" />
 			</p>
 
-			<html:textarea cols="60" rows="8" property="entryText"
-				styleClass="text-area">
+			<html:textarea cols="60" rows="8" property="entryText" styleClass="text-area">
 				<c:if test="${not empty mcGeneralLearnerFlowDTO.notebookEntry}">
 					<lams:out value="${mcGeneralLearnerFlowDTO.notebookEntry}" escapeHtml="true"/>		
 				</c:if>
 			</html:textarea>
 
 			<div class="space-bottom-top align-right">
 			    <html:link href="#" property="submitReflection" styleClass="button"
-			    onclick="javascript:document.McLearningForm.submit();return false">
-					 <span class="nextActivity"><fmt:message key="button.endLearning" /></span>
+			   		onclick="javascript:document.McLearningForm.submit();return false">
+					<span class="nextActivity"><fmt:message key="button.endLearning" /></span>
 			    </html:link>
 			</div>
 
-
 		</div>
 	</html:form>
 
-
-
 </body>
 </lams:html>
-
-
-
-
-
-
-
-
Index: lams_tool_lamc/web/learning/SimpleLearnerError.jsp
===================================================================
diff -u -rc369c0326857e08851d03a29d39d4337091f5253 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/web/learning/SimpleLearnerError.jsp	(.../SimpleLearnerError.jsp)	(revision c369c0326857e08851d03a29d39d4337091f5253)
+++ lams_tool_lamc/web/learning/SimpleLearnerError.jsp	(.../SimpleLearnerError.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -26,12 +26,4 @@
 		</div>
 	<div id="footer"></div>
 </body>
-</lams:html>
-
-
-
-
-
-
-
-
+</lams:html>
\ No newline at end of file
Index: lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp
===================================================================
diff -u -r6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp	(.../SingleQuestionAnswersContent.jsp)	(revision 6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c)
+++ lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp	(.../SingleQuestionAnswersContent.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -33,6 +33,7 @@
 
 <c:forEach var="dto" varStatus="status"	items="${requestScope.learnerAnswersDTOList}">
 	<c:if test="${dto.displayOrder == mcGeneralLearnerFlowDTO.questionIndex}">
+	
 		<div class="shading-bg">
 			<div style="overflow: auto;">
 				<span class="float-left space-right">
Index: lams_tool_lamc/web/learning/ViewAnswers.jsp
===================================================================
diff -u -r816baa75867795676ea15c9dfcc4feef712edc47 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/web/learning/ViewAnswers.jsp	(.../ViewAnswers.jsp)	(revision 816baa75867795676ea15c9dfcc4feef712edc47)
+++ lams_tool_lamc/web/learning/ViewAnswers.jsp	(.../ViewAnswers.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
 
@@ -27,10 +26,11 @@
 				elem.disabled = true;
 			}
 		}
-	         function submitForm(methodName){
-        	        var f = document.getElementById('Form1');
-	                f.submit();
-	        }
+		
+		function submitForm(methodName) {
+			var f = document.getElementById('Form1');
+			f.submit();
+		}
 	</script>
 </lams:head>
 
@@ -49,8 +49,7 @@
 			</h4>
 		</c:if>
 
-		<html:form action="/learning?method=displayMc&validate=false"
-			method="POST" target="_self" onsubmit="disableFinishButton();"  styleId="Form1">
+		<html:form action="/learning?method=displayMc&validate=false" method="POST" target="_self" onsubmit="disableFinishButton();"  styleId="Form1">
 			<html:hidden property="toolContentID" />
 			<html:hidden property="toolSessionID" />
 			<html:hidden property="httpSessionID" />
@@ -73,8 +72,7 @@
 
 			<!--  QUESTIONS  -->
 			<c:set var="mainQueIndex" scope="request" value="0" />
-			<c:forEach var="questionEntry" varStatus="status"
-				items="${mcGeneralLearnerFlowDTO.mapQuestionsContent}">
+			<c:forEach var="questionEntry" varStatus="status" items="${mcGeneralLearnerFlowDTO.mapQuestionsContent}">
 				<c:set var="mainQueIndex" scope="request" value="${mainQueIndex +1}" />
 
 				<div class="shading-bg">
@@ -83,23 +81,21 @@
 							${status.count})
 						</span>					
 						<c:out value="${questionEntry.value}" escapeXml="false" />
-					</div>																			  								
+					</div>
 
-
 					<!--  CANDIDATE ANSWERS  -->
 					<c:set var="queIndex" scope="request" value="0" />
-					<c:forEach var="mainEntry"
-						items="${mcGeneralLearnerFlowDTO.mapGeneralOptionsContent}">
+					<c:forEach var="mainEntry" items="${mcGeneralLearnerFlowDTO.mapGeneralOptionsContent}">
 						<c:set var="queIndex" scope="request" value="${queIndex +1}" />
 
 						<c:if test="${requestScope.mainQueIndex == requestScope.queIndex}">
-								<ul>
-									<c:forEach var="subEntry" items="${mainEntry.value}">
-										<li>
-											<c:out value="${subEntry.value}" escapeXml="false" /> 
-										</li>
-									</c:forEach>
-								</ul>
+							<ul>
+								<c:forEach var="subEntry" items="${mainEntry.value}">
+									<li>
+										<c:out value="${subEntry.value}" escapeXml="false" /> 
+									</li>
+								</c:forEach>
+							</ul>
 						
 							<p>
 								<c:forEach var="attemptEntry" items="${mcGeneralLearnerFlowDTO.attemptMap}">
@@ -111,14 +107,16 @@
 								<c:if test="${mcGeneralLearnerFlowDTO.displayAnswers == 'true'}">
 									<c:forEach var="attemptEntry" items="${mcGeneralLearnerFlowDTO.attemptMap}">
 										<c:if test="${requestScope.mainQueIndex == attemptEntry.key}">
+										
 											<c:choose>
 												<c:when test="${attemptEntry.value.mcOptionsContent.correctOption}">
 													<img src="<c:out value="${tool}"/>images/tick.gif" border="0" class="middle">
 												</c:when>
 												<c:otherwise>
 													<img src="<c:out value="${tool}"/>images/cross.gif" border="0" class="middle">
 												</c:otherwise>
-											</c:choose>									
+											</c:choose>
+											
 										</c:if>
 									</c:forEach>
 								</c:if>
@@ -127,47 +125,46 @@
 					</c:forEach>
 
 					<c:if test="${mcGeneralLearnerFlowDTO.displayAnswers == 'true'}">
-						<c:forEach var="feedbackEntry"
-							items="${mcGeneralLearnerFlowDTO.mapFeedbackContent}">
-							<c:if test="${requestScope.mainQueIndex == feedbackEntry.key}">
-								<c:if test="${(feedbackEntry.value != null) && (feedbackEntry.value != '')}">
-									<div style="overflow: auto;">									  							
-										<strong> <fmt:message key="label.feedback.simple" /> </strong> <c:out value="${feedbackEntry.value}" escapeXml="true" />
-									</div>								
-								</c:if>																			
+						<c:forEach var="feedbackEntry" items="${mcGeneralLearnerFlowDTO.mapFeedbackContent}">
+							<c:if test="${(requestScope.mainQueIndex == feedbackEntry.key)
+								&& (feedbackEntry.value != null) && (feedbackEntry.value != '')}">
+								
+								<div style="overflow: auto;">									  							
+									<strong> <fmt:message key="label.feedback.simple" /> </strong> <c:out value="${feedbackEntry.value}" escapeXml="true" />
+								</div>	
+																									
 							</c:if>
 						</c:forEach>
 					</c:if>
 				</div>
 			</c:forEach>
 			<!-- END QUESTION  -->
-
-
+			
 			<c:if test="${mcGeneralLearnerFlowDTO.showMarks == 'true'}">
-					<h4>
-						<fmt:message key="label.group.results" />
-					</h4>
+				<h4>
+					<fmt:message key="label.group.results" />
+				</h4>
 					
-					<table class="alternative-color" cellspacing="0">
-					  <tr>
-					  	<td width="30%"> 
-						  	  <strong> <fmt:message key="label.topMark"/> </strong>
-						 </td> 
-						 <td>	
-							  	 <c:out value="${mcGeneralLearnerFlowDTO.topMark}"/>
-					  	</td>
-					  </tr>	
+				<table class="alternative-color" cellspacing="0">
+					<tr>
+						<td width="30%"> 
+							<strong> <fmt:message key="label.topMark"/> </strong>
+						</td> 
+						<td>	
+							<c:out value="${mcGeneralLearnerFlowDTO.topMark}"/>
+						</td>
+					</tr>	
 		
-					  <tr>
-					  	<td> 
-						  	 <strong><fmt:message key="label.avMark"/> </strong>
-					  	</td>
+					<tr>
+						<td> 
+							<strong><fmt:message key="label.avMark"/> </strong>
+						</td>
 					  	<td>
-							  	<c:out value="${mcGeneralLearnerFlowDTO.averageMark}"/>
+							<c:out value="${mcGeneralLearnerFlowDTO.averageMark}"/>
 					  	</td>
-					  </tr>	
-					</table>
-				</c:if>				
+					</tr>	
+				</table>
+			</c:if>				
 
 			<c:if test="${(mcGeneralLearnerFlowDTO.learnerProgress != 'true') && (mcGeneralLearnerFlowDTO.retries == 'true') && hasEditRight}">
 				<html:submit property="redoQuestions" styleClass="button">
@@ -225,7 +222,7 @@
 			</c:if>
 
 			<p>							
-			<html:hidden property="doneLearnerProgress" />
+				<html:hidden property="doneLearnerProgress" />
 			</p>
 			
 		</html:form>
Index: lams_tool_lamc/web/learning/mobile/AnswersContent.jsp
===================================================================
diff -u -r344ed95b6b62ebd716c85cd256320cd723a18a13 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/web/learning/mobile/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 344ed95b6b62ebd716c85cd256320cd723a18a13)
+++ lams_tool_lamc/web/learning/mobile/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -14,6 +14,7 @@
 <lams:head>
 	<title><fmt:message key="activity.title" /></title>
 	<%@ include file="/common/mobileheader.jsp"%>
+	<link rel="stylesheet" type="text/css" href="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
 	
 	<style media="screen,projection" type="text/css">
 		div.growlUI { background: url(check48.png) no-repeat 10px 10px }
@@ -22,19 +23,22 @@
 		}
 	</style>
 	
+        <script src="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+        <script src="jquery.bootstrap-growl.js"></script>
+	
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.form.js"></script>
-	<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>	
 	<script language="JavaScript" type="text/JavaScript">
 		//autoSaveAnswers if hasEditRight
 		if (${hasEditRight}) {
-			var interval = "30000"; // = 30 seconds
+			var interval = "5000"; // = 30 seconds
 			window.setInterval(
 				function(){
 					//ajax form submit
 					$('#learningForm').ajaxSubmit({
 						url: "<c:url value='/learning.do?method=autoSaveAnswers&date='/>" + new Date().getTime(),
 			            success: function() {
-			                $.growlUI('<fmt:message key="label.learning.draft.autosaved" />');
+			            	$.bootstrapGrowl("This is a test.");
+			                //$.growlUI('<fmt:message key="label.learning.draft.autosaved" />');
 			            }
 					});
 		        }, interval
Index: lams_tool_lamc/web/learning/submissionDeadline.jsp
===================================================================
diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/web/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision be07c35c372d904a65581d98660e73f3b13b69db)
+++ lams_tool_lamc/web/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
 
@@ -24,23 +23,22 @@
 				elem.disabled = true;
 			}
 		}
-	         function submitForm(methodName){
-	                var f = document.getElementById('messageForm');
-	                f.submit();
-	        }
+		
+		function submitForm(methodName){
+			var f = document.getElementById('messageForm');
+			f.submit();
+		}
 	</script>
 </lams:head>
 
 <body class="stripes">
 
-	<html:form action="/learning?method=displayMc&validate=false"
-		method="POST" onsubmit="disableFinishButton();" styleId="messageForm">
+	<html:form action="/learning?method=displayMc&validate=false" method="POST" onsubmit="disableFinishButton();" styleId="messageForm">
 		<html:hidden property="toolContentID" />
 		<html:hidden property="toolSessionID" />
 		<html:hidden property="httpSessionID" />
 		<html:hidden property="userID" />
 
-
 		<div id="content">
 
 			<h1>
@@ -78,16 +76,10 @@
 					</html:submit>
 				</c:if>
 			</div>
+			
 		</div>
 	</html:form>
+	
 	<div id="footer"></div>
 </body>
 </lams:html>
-
-
-
-
-
-
-
-
Index: lams_tool_lamc/web/monitoring/Edit.jsp
===================================================================
diff -u -r9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/web/monitoring/Edit.jsp	(.../Edit.jsp)	(revision 9db7a5bb39fecf9a0f1ae5cf2a9f701d2aa1532f)
+++ lams_tool_lamc/web/monitoring/Edit.jsp	(.../Edit.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -83,10 +83,5 @@
 			</html:link>				 		  					
 		</td>
 	</tr>
-</table>
-
-
-
-
+</table>		
 		
-		
Index: lams_tool_lamc/web/monitoring/LearnerNotebook.jsp
===================================================================
diff -u -r816baa75867795676ea15c9dfcc4feef712edc47 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/web/monitoring/LearnerNotebook.jsp	(.../LearnerNotebook.jsp)	(revision 816baa75867795676ea15c9dfcc4feef712edc47)
+++ lams_tool_lamc/web/monitoring/LearnerNotebook.jsp	(.../LearnerNotebook.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -21,53 +21,44 @@
 <body class="stripes">
 	
 	<html:form  action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self">		
-	
-		<div id="content">
+	<div id="content">
 		
 		<h1>
 			<fmt:message key="label.view.reflection"/>
 		</h1>
-	
 
-			<table>
-				<tr>
-					<td>
-						<h2>
-							<c:out value="${mcGeneralLearnerFlowDTO.userName}" escapeXml="true"/>
-						</h2>
-					</td>
-				</tr>
-				<tr>
-					<td>
-						<p><lams:out value="${mcGeneralLearnerFlowDTO.notebookEntry}" escapeHtml="true"/></p>
-					</td>
-				</tr>
-			</table>
+		<table>
+			<tr>
+				<td>
+					<h2>
+						<c:out value="${mcGeneralLearnerFlowDTO.userName}" escapeXml="true"/>
+					</h2>
+				</td>
+			</tr>
+				
+			<tr>
+				<td>
+					<p>
+						<lams:out value="${mcGeneralLearnerFlowDTO.notebookEntry}" escapeHtml="true"/>
+					</p>
+				</td>
+			</tr>
+		</table>
 
-			<table cellpadding="0">
-				<tr>
-					<td>
-						<a href="javascript:window.close();" class="button">
-							<fmt:message key="label.close"/></a>
-					</td>
-				</tr>
-			</table>
-
+		<table cellpadding="0">
+			<tr>
+				<td>
+					<a href="javascript:window.close();" class="button">
+						<fmt:message key="label.close"/>
+					</a>
+				</td>
+			</tr>
+		</table>
 		
-		</div>
+	</div>
 	</html:form>	
 	
 	<div id="footer"></div>
 
-
-</div>
 </body>
 </lams:html>
-
-
-
-
-
-
-
-
Index: lams_tool_lamc/web/monitoring/Reflections.jsp
===================================================================
diff -u -r24b8afc681eaf7ee41fc7b59aab54cf86140044c -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/web/monitoring/Reflections.jsp	(.../Reflections.jsp)	(revision 24b8afc681eaf7ee41fc7b59aab54cf86140044c)
+++ lams_tool_lamc/web/monitoring/Reflections.jsp	(.../Reflections.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -1,41 +1,40 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-				<c:if test="${notebookEntriesExist == 'true' }"> 			
-					<table class="alternative-color">
+<c:if test="${notebookEntriesExist == 'true' }"> 			
+	<table class="alternative-color">
 						
-								<tr>			
-									<th colspan=2 class="align-left">
-										<b>  <fmt:message key="label.reflection"/>  </b> 
-									 </th>
-								</tr>	
+		<tr>			
+			<th colspan=2 class="align-left">
+				<b>  <fmt:message key="label.reflection"/>  </b> 
+			</th>
+		</tr>		
 						
-						
-							<c:forEach var="currentDto" items="${reflectionsContainerDTO}">
-					  	 		<c:set var="userName" scope="request" value="${currentDto.userName}"/>
-					  	 		<c:set var="userId" scope="request" value="${currentDto.userId}"/>
-					  	 		<c:set var="sessionId" scope="request" value="${currentDto.sessionId}"/>
-					  	 		<c:set var="reflectionUid" scope="request" value="${currentDto.reflectionUid}"/>
-								<tr>			
-									<td valign=top class="align-left">
-										 <c:out value="${userName}" escapeXml="true"/> 
-									 </td>
+		<c:forEach var="currentDto" items="${reflectionsContainerDTO}">
+			<c:set var="userName" scope="request" value="${currentDto.userName}"/>
+			<c:set var="userId" scope="request" value="${currentDto.userId}"/>
+			<c:set var="sessionId" scope="request" value="${currentDto.sessionId}"/>
+			<c:set var="reflectionUid" scope="request" value="${currentDto.reflectionUid}"/>
+			
+			<tr>			
+				<td valign=top class="align-left">
+					<c:out value="${userName}" escapeXml="true"/> 
+				</td>
 	
-									<td valign=top class="align-right">
-										<c:url value="monitoring.do" var="openNotebook">
-											<c:param name="dispatch" value="openNotebook" />
-											<c:param name="uid" value="${reflectionUid}" />
-											<c:param name="userId" value="${userId}" />
-											<c:param name="userName" value="${fn:escapeXml(userName)}" />
-											<c:param name="sessionId" value="${sessionId}" />													
-											<c:param name="contentFolderID" value="${McMonitoringForm.contentFolderID}" />																								
-										</c:url>
+				<td valign=top class="align-right">
+					<c:url value="monitoring.do" var="openNotebook">
+						<c:param name="dispatch" value="openNotebook" />
+						<c:param name="uid" value="${reflectionUid}" />
+						<c:param name="userId" value="${userId}" />
+						<c:param name="userName" value="${fn:escapeXml(userName)}" />
+						<c:param name="sessionId" value="${sessionId}" />													
+						<c:param name="contentFolderID" value="${McMonitoringForm.contentFolderID}" />																								
+					</c:url>
 		
-										<html:link href="javascript:launchPopup('${fn:escapeXml(openNotebook)}');" styleClass="button">
-											<fmt:message key="label.view" />
-										</html:link>
-	
-									 </td>
-								</tr>	
-							</c:forEach>		
-						</table>
-				</c:if> 															
+					<html:link href="javascript:launchPopup('${fn:escapeXml(openNotebook)}');" styleClass="button">
+						<fmt:message key="label.view" />
+					</html:link>
+				</td>
+			</tr>	
+		</c:forEach>		
+	</table>
+</c:if> 															
Index: lams_tool_lamc/web/monitoring/Stats.jsp
===================================================================
diff -u -re86557b2e2a6b6dd1c750263f1bacc60fceaabbb -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/web/monitoring/Stats.jsp	(.../Stats.jsp)	(revision e86557b2e2a6b6dd1c750263f1bacc60fceaabbb)
+++ lams_tool_lamc/web/monitoring/Stats.jsp	(.../Stats.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -3,24 +3,22 @@
 <c:set var="lams"><lams:LAMSURL/></c:set>
 <c:set var="tool"><lams:WebAppURL/></c:set>
 
-		<table class="alternative-color">
-						<tr> 
-							<th>
-				  				<b> <fmt:message key="count.total.user" /> </b>
-				  			</th>
-							<td align="right">
-							  	  <c:out value="${mcGeneralMonitoringDTO.countAllUsers}"/>
-							</td> 
-						</tr>
+<table class="alternative-color">
+	<tr> 
+		<th>
+			<b> <fmt:message key="count.total.user" /> </b>
+		</th>
+		<td align="right">
+			<c:out value="${mcGeneralMonitoringDTO.countAllUsers}"/>
+		</td> 
+	</tr>
 						
-						<tr> 
-							<th>
-				  				<b>  <fmt:message key="count.finished.session" /> </b>
-				  			</th>
-							<td align="right">
-							  	 <c:out value="${mcGeneralMonitoringDTO.countSessionComplete}"/>
-							</td> 
-						</tr>
-		</table>
-
-
+	<tr> 
+		<th>
+			<b>  <fmt:message key="count.finished.session" /> </b>
+		</th>
+		<td align="right">
+			<c:out value="${mcGeneralMonitoringDTO.countSessionComplete}"/>
+		</td> 
+	</tr>
+</table>
\ No newline at end of file
Index: lams_tool_lamc/web/monitoring/parts/advanceOptions.jsp
===================================================================
diff -u -r816baa75867795676ea15c9dfcc4feef712edc47 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/web/monitoring/parts/advanceOptions.jsp	(.../advanceOptions.jsp)	(revision 816baa75867795676ea15c9dfcc4feef712edc47)
+++ lams_tool_lamc/web/monitoring/parts/advanceOptions.jsp	(.../advanceOptions.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -165,21 +165,23 @@
 	</c:choose>
 </table>
 
-	<c:choose>
-		<c:when test="${mcGeneralMonitoringDTO.displayAnswers == 'true'}">
-			<p>
-				<fmt:message key="label.monitoring.yesDisplayAnswers"/>
-			</p>
-		</c:when>
-		<c:when test="${mcGeneralMonitoringDTO.displayAnswers == 'false'}">
-			<p>
-				<fmt:message key="label.monitoring.noDisplayAnswers1"/><br>
-				<quote>
+<c:choose>
+	<c:when test="${mcGeneralMonitoringDTO.displayAnswers == 'true'}">
+		<p>
+			<fmt:message key="label.monitoring.yesDisplayAnswers"/>
+		</p>
+	</c:when>
+	<c:when test="${mcGeneralMonitoringDTO.displayAnswers == 'false'}">
+		<p>
+			<fmt:message key="label.monitoring.noDisplayAnswers1"/>
+			<br>
+			
+			<quote>
 				<fmt:message key="label.monitoring.noDisplayAnswers2"/>
 				<input onclick="javascript:submitChangeDisplayAnswers(this.value, 'displayAnswers');" class="button" name="displayAnswers" class="button" value="<fmt:message key='button.monitoring.noDisplayAnswers'/>" type="button">	
-				</quote>
-			</p>
-		</c:when>
-	</c:choose>
+			</quote>
+		</p>
+	</c:when>
+</c:choose>
 
 </div>
Index: lams_tool_lamc/web/monitoring/parts/advanceQuestions.jsp
===================================================================
diff -u -rd66da54e1b79ff5493ac331ec290649184965a7e -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_lamc/web/monitoring/parts/advanceQuestions.jsp	(.../advanceQuestions.jsp)	(revision d66da54e1b79ff5493ac331ec290649184965a7e)
+++ lams_tool_lamc/web/monitoring/parts/advanceQuestions.jsp	(.../advanceQuestions.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -8,45 +8,44 @@
 
 <div class="monitoring-advanced" id="advanced-questions" style="display:none">
 
-		<c:if test="${mcGeneralMonitoringDTO.userExceptionNoToolSessions != 'true'}"> 	
-				
-			<table class="forms">
-					
-				<c:forEach var="question" items="${content.mcQueContents}" varStatus="i">
+	<c:if test="${mcGeneralMonitoringDTO.userExceptionNoToolSessions != 'true'}">
+		<table class="forms">
+			<c:forEach var="question" items="${content.mcQueContents}" varStatus="i">
 
-						<tr>			
-							<td NOWRAP valign=top class="align-left"><b>  <fmt:message key="label.question.only"/> ${i.index + 1}:</b>
-								<c:out value="${question.question}" escapeXml="false"/> &nbsp (<fmt:message key="label.mark"/> <c:out value="${question.mark}"/> )
-							 </td>
-						</tr>	
-						<tr>					
-							<td NOWRAP valign=top class="align-left">  <b> <fmt:message key="label.mc.options.col"/>  </b> 
-								<table class="align-left">
-									<c:forEach var="option" items="${question.mcOptionsContents}">
-										<tr>			
-											<td NOWRAP valign=top class="align-left">
-												&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
-												<c:out value="${option.mcQueOptionText}" escapeXml="false"/> 
+				<tr>			
+					<td NOWRAP valign=top class="align-left"><b>  <fmt:message key="label.question.only"/> ${i.index + 1}:</b>
+						<c:out value="${question.question}" escapeXml="false"/> &nbsp (<fmt:message key="label.mark"/> <c:out value="${question.mark}"/> )
+					</td>
+				</tr>
+						
+				<tr>					
+					<td NOWRAP valign=top class="align-left">  <b> <fmt:message key="label.mc.options.col"/>  </b> 
+						<table class="align-left">
+							<c:forEach var="option" items="${question.mcOptionsContents}">
+								<tr>			
+									<td NOWRAP valign=top class="align-left">
+										&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
+										<c:out value="${option.mcQueOptionText}" escapeXml="false"/> 
 												
-												<c:if test="${option.correctOption}"> 		
-													&nbsp (<fmt:message key="label.correct"/>)
-												</c:if>																		
-											</td>	
-										</tr>
-									</c:forEach>		  	
-								</table>
-							</td>  
-						</tr>			
+										<c:if test="${option.correctOption}"> 		
+											&nbsp (<fmt:message key="label.correct"/>)
+										</c:if>																		
+									</td>	
+								</tr>
+							</c:forEach>		  	
+						</table>
+					</td>  
+				</tr>			
 
-				</c:forEach>		  	
+			</c:forEach>		  	
 
-		  	 	<tr>
-		  	 		<td NOWRAP valign=top class="align-left"> <b> 
-		  	 			<fmt:message key="label.passingMark"/>: </b> <c:out value="${passMark}"/> 
-		  	 		</td>
-		  	 	</tr>
-			</table>
-		</c:if>
+		  	<tr>
+		  	 	<td NOWRAP valign=top class="align-left"> <b> 
+		  	 		<fmt:message key="label.passingMark"/>: </b> <c:out value="${passMark}"/> 
+		  	 	</td>
+		  	</tr>
+		</table>
+	</c:if>
 
 </div>
 		
\ No newline at end of file
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaQueUsrDAO.java
===================================================================
diff -u -ra7661f206a3f21114f1c05f9a29f56e20f5e35f0 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaQueUsrDAO.java	(.../IQaQueUsrDAO.java)	(revision a7661f206a3f21114f1c05f9a29f56e20f5e35f0)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaQueUsrDAO.java	(.../IQaQueUsrDAO.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -44,7 +44,5 @@
 
     int countSessionUser(QaSession qaSession);
 
-    int getTotalNumberOfUsers(QaContent qa);
-
     List getUserBySessionOnly(final QaSession qaSession);
 }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaSessionDAO.java
===================================================================
diff -u -ra7661f206a3f21114f1c05f9a29f56e20f5e35f0 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaSessionDAO.java	(.../IQaSessionDAO.java)	(revision a7661f206a3f21114f1c05f9a29f56e20f5e35f0)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaSessionDAO.java	(.../IQaSessionDAO.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -33,15 +33,11 @@
  */
 public interface IQaSessionDAO {
 
-    int countSessionComplete(QaContent qa);
-
     QaSession getQaSessionById(long qaSessionId);
 
     void createSession(QaSession session);
 
     void UpdateQaSession(QaSession session);
 
     void deleteQaSession(QaSession session);
-
-    List getSessionsFromContent(QaContent qaContent);
 }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java
===================================================================
diff -u -ra7661f206a3f21114f1c05f9a29f56e20f5e35f0 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java	(.../QaQueUsrDAO.java)	(revision a7661f206a3f21114f1c05f9a29f56e20f5e35f0)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueUsrDAO.java	(.../QaQueUsrDAO.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -44,9 +44,6 @@
     private static final String COUNT_SESSION_USER = "select qaQueUsr.queUsrId from QaQueUsr qaQueUsr where qaQueUsr.qaSession.qaSessionId= :qaSession";
     private static final String LOAD_USER_FOR_SESSION = "from qaQueUsr in class QaQueUsr where  qaQueUsr.qaSession.qaSessionId= :qaSessionId";
 
-    private static final String GET_USER_COUNT_FOR_CONTENT = "select count(*) from QaQueUsr quser, QaSession qses, QaQueContent qcon where "
-	    + "quser.qaSession=qses and " + "qses.qaContent=qcon and " + "qcon.uid=:uid";
-
     public int countSessionUser(QaSession qaSession) {
 	return (getHibernateTemplate().findByNamedParam(COUNT_SESSION_USER, "qaSession", qaSession)).size();
     }
@@ -87,17 +84,4 @@
 	this.getHibernateTemplate().delete(qaQueUsr);
     }
 
-    public int getTotalNumberOfUsers(QaContent qa) {
-
-	int returnInt = 0;
-	if (qa != null && qa.getUid() != null) {
-	    List result = getSession().createQuery(GET_USER_COUNT_FOR_CONTENT).setLong("uid", qa.getUid()).list();
-	    Long resultLong = (result.get(0) != null) ? (Long) result.get(0) : new Long(0);
-	    returnInt = resultLong.intValue();
-	} else {
-	    logger.error("Attempt to count users from null content");
-	}
-	return returnInt; 
-    }
-
 }
\ No newline at end of file
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaSessionDAO.java
===================================================================
diff -u -ra7661f206a3f21114f1c05f9a29f56e20f5e35f0 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaSessionDAO.java	(.../QaSessionDAO.java)	(revision a7661f206a3f21114f1c05f9a29f56e20f5e35f0)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaSessionDAO.java	(.../QaSessionDAO.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -36,22 +36,7 @@
  * 
  */
 public class QaSessionDAO extends HibernateDaoSupport implements IQaSessionDAO {
-    private static final String COUNT_SESSION_COMPLETE = "from   qaSession in class QaSession where qaSession.session_status='COMPLETE'";
-    private static final String GET_SESSION_IDS_FROM_CONTENT = "select qas.qaSessionId from QaSession qas where qas.qaContent=:qaContent order by qas.session_name asc";
 
-    public int countSessionComplete(QaContent qa) {
-	List list = getSession().createQuery(COUNT_SESSION_COMPLETE).list();
-
-	int sessionCount = 0;
-	if (list != null && list.size() > 0) {
-	    QaSession qaSession = (QaSession) list.get(0);
-	    if (qaSession.getQaContent().getUid().intValue() == qa.getUid().intValue()) {
-		++sessionCount;
-	    }
-	}
-	return sessionCount;
-    }
-
     /**
      * @see org.lamsfoundation.lams.tool.survey.dao.interfaces.ISurveySessionDAO#getSurveySessionById(long)
      */
@@ -90,8 +75,4 @@
 	this.getHibernateTemplate().delete(qaSession);
     }
 
-    public List getSessionsFromContent(QaContent qaContent) {
-	return (getHibernateTemplate().findByNamedParam(GET_SESSION_IDS_FROM_CONTENT, "qaContent", qaContent));
-    }
-
 }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
===================================================================
diff -u -r3ff38201dcc90ccdf402ac3ba094b0c05fd32d05 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml	(.../qaApplicationContext.xml)	(revision 3ff38201dcc90ccdf402ac3ba094b0c05fd32d05)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml	(.../qaApplicationContext.xml)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -102,6 +102,7 @@
 					<prop key="get*">PROPAGATION_REQUIRED, -QaApplicationException</prop>
 					<prop key="remove*">PROPAGATION_REQUIRED,-QaApplicationException</prop>
                 	<prop key="resetDefineLater">PROPAGATION_REQUIRED,-QaApplicationException</prop>
+                	<prop key="setDefineLater">PROPAGATION_REQUIRED,-QaApplicationException</prop>
                 	<prop key="notifyTeachersOnResponseSubmit">PROPAGATION_REQUIRED,-QaApplicationException</prop>
 					<prop key="checkLeaderSelectToolForSessionLeader">PROPAGATION_REQUIRED,-QaApplicationException</prop>
 					<prop key="importToolContent">PROPAGATION_REQUIRED,-QaApplicationException</prop>
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java
===================================================================
diff -u -r7d0d609b844ea5e9c41f46d209825ce5bd4fb83a -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java	(.../IQaService.java)	(revision 7d0d609b844ea5e9c41f46d209825ce5bd4fb83a)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java	(.../IQaService.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -45,6 +45,7 @@
 import org.lamsfoundation.lams.tool.qa.dto.GroupDTO;
 import org.lamsfoundation.lams.tool.qa.dto.QaQuestionDTO;
 import org.lamsfoundation.lams.tool.qa.dto.ReflectionDTO;
+import org.lamsfoundation.lams.tool.qa.util.QaApplicationException;
 import org.lamsfoundation.lams.util.audit.IAuditService;
 
 /**
@@ -76,6 +77,8 @@
      * @param leader
      */
     void copyAnswersFromLeader(QaQueUsr user, QaQueUsr leader);
+    
+    void setDefineLater(String strToolContentID, boolean value);
 
     /**
      * Get users by given toolSessionID.
@@ -97,10 +100,6 @@
 
     void saveOrUpdateQaContent(QaContent qa);
 
-    int getTotalNumberOfUsers(QaContent qa);
-
-    int countSessionComplete(QaContent qa);
-
     void updateUser(QaQueUsr qaQueUsr);
     
     List<QaUsrResp> getResponsesByUserUid(final Long userUid);
@@ -154,12 +153,8 @@
      */
     QaSession getSessionById(long qaSessionId);
 
-    void createSession(QaSession qaSession);
-
     void removeToolSession(Long toolSessionId) throws DataMissingException, ToolException;
 
-    List getSessionsFromContent(QaContent qaContent);
-
     QaQueUsr createUser(Long toolSessionID);
 
     void updateSession(QaSession qaSession);
@@ -176,8 +171,6 @@
 
     List getAllQuestionEntries(final Long uid);
 
-    List getUserBySessionOnly(final QaSession qaSession);
-
     void recalculateUserAnswers(QaContent content, Set<QaQueContent> oldQuestions, List<QaQuestionDTO> questionDTOs,
 	    List<QaQuestionDTO> deletedQuestions);
 
@@ -189,6 +182,13 @@
      */
     void copyToolContent(Long fromContentId, Long toContentId) throws ToolException;
 
+    /**
+     * checks the paramter content in the user responses table
+     * 
+     * @param qa
+     * @return boolean
+     * @throws QaApplicationException
+     */
     boolean isStudentActivityOccurredGlobal(QaContent qaContent);
 
     /**
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
===================================================================
diff -u -r7d0d609b844ea5e9c41f46d209825ce5bd4fb83a -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	(.../QaServicePOJO.java)	(revision 7d0d609b844ea5e9c41f46d209825ce5bd4fb83a)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	(.../QaServicePOJO.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -39,6 +39,7 @@
 import java.util.TreeMap;
 import java.util.TreeSet;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
@@ -205,29 +206,45 @@
 	    }
 	}
     }
+    
+    @Override
+    public void setDefineLater(String strToolContentID, boolean value) {
 
+	QaContent qaContent = getQaContent(new Long(strToolContentID).longValue());
+
+	if (qaContent != null) {
+	    qaContent.setDefineLater(value);
+	    updateQaContent(qaContent);
+	}
+    }
+
     @Override
     public List<QaQueUsr> getUsersBySessionId(Long toolSessionID) {
 	QaSession session = qaSessionDAO.getQaSessionById(toolSessionID);
 	return qaQueUsrDAO.getUserBySessionOnly(session);
     }
 
+    @Override
     public void createQaContent(QaContent qaContent) {
 	qaDAO.saveQa(qaContent);
     }
 
+    @Override
     public QaContent getQaContent(long toolContentID) {
 	return qaDAO.getQaByContentId(toolContentID);
     }
 
+    @Override
     public void saveOrUpdateQaContent(QaContent qa) {
 	qaDAO.saveOrUpdateQa(qa);
     }
 
+    @Override
     public QaQueContent getQuestionByContentAndDisplayOrder(Long displayOrder, Long contentUid) {
 	return qaQuestionDAO.getQuestionByDisplayOrder(displayOrder, contentUid);
     }
     
+    @Override
     public QaQueContent getQuestionByUid(Long questionUid) {
 	if (questionUid == null) {
 	    return null;
@@ -236,22 +253,16 @@
 	return qaQuestionDAO.getQuestionByUid(questionUid);
     }
 
+    @Override
     public void saveOrUpdateQuestion(QaQueContent question) {
 	qaQuestionDAO.saveOrUpdateQaQueContent(question);
     }
 
+    @Override
     public void createQuestion(QaQueContent question) {
 	qaQuestionDAO.createQueContent(question);
     }
 
-    public void createSession(QaSession qaSession) {
-	qaSessionDAO.createSession(qaSession);
-    }
-
-    public List getSessionsFromContent(QaContent qaContent) {
-	return qaSessionDAO.getSessionsFromContent(qaContent);
-    }
-
     public QaQueUsr createUser(Long toolSessionID) {
 	HttpSession ss = SessionManager.getSession();
 	UserDTO toolUser = (UserDTO) ss.getAttribute(AttributeNames.USER);
@@ -307,10 +318,12 @@
 	return qaResponseRatingDAO.getAverageRatingDTOByUserAndContentId(userUid, contentId);
     }
 
+    @Override
     public void updateUserResponse(QaUsrResp resp) {
 	qaUsrRespDAO.updateUserResponse(resp);
     }
 
+    @Override
     public void updateResponseWithNewAnswer(String newAnswer, String toolSessionID, Long questionDisplayOrder) {
 	HttpSession ss = SessionManager.getSession();
 	UserDTO toolUser = (UserDTO) ss.getAttribute(AttributeNames.USER);
@@ -337,38 +350,37 @@
 	}
     }
 
-    public List getUserBySessionOnly(final QaSession qaSession) {
-	return qaQueUsrDAO.getUserBySessionOnly(qaSession);
-    }
-
+    @Override
     public void createUserResponse(QaUsrResp qaUsrResp) {
 	qaUsrRespDAO.createUserResponse(qaUsrResp);
     }
 
+    @Override
     public void updateUser(QaQueUsr qaQueUsr) {
 	qaQueUsrDAO.updateUsr(qaQueUsr);
     }
 
+    @Override
     public QaUsrResp getResponseById(Long responseId) {
 	return qaUsrRespDAO.getResponseById(responseId);
     }
 
-    public int countSessionComplete(QaContent qa) {
-	return qaSessionDAO.countSessionComplete(qa);
-    }
-
+    @Override
     public QaSession getSessionById(long qaSessionId) {
 	return qaSessionDAO.getQaSessionById(qaSessionId);
     }
 
+    @Override
     public void updateQaContent(QaContent qa) {
 	qaDAO.updateQa(qa);
     }
 
+    @Override
     public void updateSession(QaSession qaSession) {
 	qaSessionDAO.UpdateQaSession(qaSession);
     }
 
+    @Override
     public void removeUserResponse(QaUsrResp resp) {
 	auditService.logChange(QaAppConstants.MY_SIGNATURE, resp.getQaQueUser().getQueUsrId(), resp.getQaQueUser()
 		.getUsername(), resp.getAnswer(), null);
@@ -397,29 +409,22 @@
 	}
     }
 
-    public int getTotalNumberOfUsers(QaContent qa) {
-	return qaQueUsrDAO.getTotalNumberOfUsers(qa);
-    }
-
+    @Override
     public List<QaQueContent> getAllQuestionEntries(final Long uid) {
 	return qaQuestionDAO.getAllQuestionEntries(uid.longValue());
     }
 
+    @Override
     public List<QaQueContent> getAllQuestionEntriesSorted(final long contentUid) {
 	return qaQuestionDAO.getAllQuestionEntriesSorted(contentUid);
     }
 
+    @Override
     public void removeQuestion(QaQueContent question) {
 	qaQuestionDAO.removeQaQueContent(question);
     }
 
-    /**
-     * checks the paramter content in the user responses table
-     * 
-     * @param qa
-     * @return boolean
-     * @throws QaApplicationException
-     */
+    @Override
     public boolean isStudentActivityOccurredGlobal(QaContent qaContent) {
 	int countResponses = 0;
 	if (qaContent != null) {
@@ -609,6 +614,7 @@
 	}
     }
 
+    @Override
     public AverageRatingDTO rateResponse(Long responseId, Long userId, Long toolSessionID, float rating) {
 	QaQueUsr imageGalleryUser = this.getUserByIdAndSession(userId, toolSessionID);
 	ResponseRating responseRating = qaResponseRatingDAO.getRatingByResponseAndUser(responseId, userId);
@@ -627,10 +633,12 @@
 	return qaResponseRatingDAO.getAverageRatingDTOByResponse(responseId);
     }
 
+    @Override
     public AverageRatingDTO getAverageRatingDTOByResponse(Long responseId) {
 	return qaResponseRatingDAO.getAverageRatingDTOByResponse(responseId);
     }
 
+    @Override
     public List<ReflectionDTO> getReflectList(QaContent content, String userID) {
 
 	// reflection data for all sessions
@@ -905,15 +913,7 @@
 	eventNotificationService.notifyLessonMonitors(sessionId, message, true);
     }
 
-    /**
-     * Export the XML fragment for the tool's content, along with any files needed for the content.
-     * 
-     * @throws DataMissingException
-     *             if no tool content matches the toolSessionId
-     * @throws ToolException
-     *             if any other error occurs
-     */
-
+    @Override
     public void exportToolContent(Long toolContentID, String rootPath) {
 	QaContent toolContentObj = qaDAO.getQaByContentId(toolContentID);
 	if (toolContentObj == null) {
@@ -946,12 +946,7 @@
 	}
     }
 
-    /**
-     * Import the XML fragment for the tool's content, along with any files needed for the content.
-     * 
-     * @throws ToolException
-     *             if any other error occurs
-     */
+    @Override
     public void importToolContent(Long toolContentID, Integer newUserUid, String toolContentPath, String fromVersion,
 	    String toVersion) throws ToolException {
 	try {
@@ -981,14 +976,7 @@
 	}
     }
 
-    /**
-     * Get the definitions for possible output for an activity, based on the toolContentId. These may be definitions
-     * that are always available for the tool (e.g. number of marks for Multiple Choice) or a custom definition created
-     * for a particular activity such as the answer to the third question contains the word Koala and hence the need for
-     * the toolContentId
-     * 
-     * @return SortedMap of ToolOutputDefinitions with the key being the name of each definition
-     */
+    @Override
     public SortedMap<String, ToolOutputDefinition> getToolOutputDefinitions(Long toolContentId, int definitionType)
 	    throws ToolException {
 	QaContent qaContent = qaDAO.getQaByContentId(toolContentId);
@@ -1010,11 +998,7 @@
 	return qaDAO.getQaByContentId(toolContentId).isDefineLater();
     }
 
-    /**
-     * ToolSessionManager CONTRACT : creates a tool session with the incoming toolSessionId in the tool session table
-     * 
-     * gets called only in the Learner mode. All the learners in the same group have the same toolSessionId.
-     */
+    @Override
     public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentID) throws ToolException {
 
 	if (toolSessionId == null) {
@@ -1040,6 +1024,7 @@
 	}
     }
 
+    @Override
     public void removeToolSession(Long toolSessionId) throws DataMissingException, ToolException {
 	if (toolSessionId == null) {
 	    QaServicePOJO.logger.error("toolSessionId is null");
@@ -1067,13 +1052,7 @@
 	}
     }
 
-    /**
-     * Complete the tool session.
-     * 
-     * Part of the ToolSessionManager contract. Called by controller service to force complete the qa session, or by the
-     * web front end to complete the qa session
-     * 
-     */
+    @Override
     public String leaveToolSession(Long toolSessionId, Long learnerId) throws DataMissingException, ToolException {
 
 	if (toolSessionId == null) {
@@ -1102,28 +1081,20 @@
 
     /**
      * ToolSessionManager CONTRACT
-     * 
      */
     public ToolSessionExportOutputData exportToolSession(Long toolSessionId) throws DataMissingException, ToolException {
 	throw new ToolException("not yet implemented");
     }
 
     /**
      * ToolSessionManager CONTRACT
-     * 
      */
     public ToolSessionExportOutputData exportToolSession(List toolSessionIds) throws DataMissingException,
 	    ToolException {
-
 	throw new ToolException("not yet implemented");
     }
 
-    /**
-     * Get the tool output for the given tool output names.
-     * 
-     * @see org.lamsfoundation.lams.tool.ToolSessionManager#getToolOutput(java.util.List<String>, java.lang.Long,
-     *      java.lang.Long)
-     */
+    @Override
     public SortedMap<String, ToolOutput> getToolOutput(List<String> names, Long toolSessionId, Long learnerId) {
 	return getQaOutputFactory().getToolOutput(names, this, toolSessionId, learnerId);
     }
@@ -1360,9 +1331,7 @@
 
     }
 
-    /**
-     * Set the description, throws away the title value as this is not supported in 2.0
-     */
+    @Override
     public void setReflectiveData(Long toolContentId, String title, String description) throws ToolException,
 	    DataMissingException {
 
@@ -1431,6 +1400,7 @@
 	this.qaWizardDAO = qaWizardDAO;
     }
 
+    @Override
     public QaContent getQaContentBySessionId(Long sessionId) {
 	QaSession session = qaSessionDAO.getQaSessionById(sessionId);
 	// to skip CGLib problem
@@ -1439,9 +1409,7 @@
 	return qaContent;
     }
 
-    /**
-     * {@inheritDoc}
-     */
+    @Override
     public String createConditionName(Collection<QaCondition> existingConditions) {
 	String uniqueNumber = null;
 	do {
@@ -1456,95 +1424,69 @@
 	return getQaOutputFactory().buildUserAnswersConditionName(uniqueNumber);
     }
 
+    @Override
     public void deleteCondition(QaCondition condition) {
 	if (condition != null && condition.getConditionId() != null) {
 	    qaDAO.deleteCondition(condition);
 	}
     }
 
+    @Override
     public QaCondition createDefaultComplexCondition(QaContent qaContent) {
 	return getQaOutputFactory().createDefaultComplexUserAnswersCondition(qaContent);
     }
 
-    /**
-     * Gets the qa config item with the given key
-     * 
-     * @param configKey
-     * @return
-     */
+    @Override
     public QaConfigItem getConfigItem(String configKey) {
 	return qaConfigItemDAO.getConfigItemByKey(configKey);
     }
 
-    /**
-     * Saves or updates a qa config item
-     * 
-     * @param configItem
-     */
+    @Override
     public void saveOrUpdateConfigItem(QaConfigItem configItem) {
 	qaConfigItemDAO.saveOrUpdate(configItem);
     }
 
-    /**
-     * Gets the set of wizard categories from the database
-     * 
-     * @return
-     */
+    @Override
     public SortedSet<QaWizardCategory> getWizardCategories() {
 	return qaWizardDAO.getWizardCategories();
     }
 
-    /**
-     * Saves the entire set of QaWizardCategories (including the child cognitive skills and questions)
-     * 
-     * @param categories
-     */
+    @Override
     public void saveOrUpdateQaWizardCategories(SortedSet<QaWizardCategory> categories) {
 	qaWizardDAO.saveOrUpdateCategories(categories);
     }
 
-    /**
-     * Deletes a wizard category from the db
-     * 
-     * @param uid
-     */
+    @Override
     public void deleteWizardCategoryByUID(Long uid) {
 	qaWizardDAO.deleteWizardCategoryByUID(uid);
     }
 
-    /**
-     * Deletes a wizard cognitive skill from the db
-     * 
-     * @param uid
-     */
+    @Override
     public void deleteWizardSkillByUID(Long uid) {
 	qaWizardDAO.deleteWizardSkillByUID(uid);
     }
 
-    /**
-     * Deletes a wizard question from the db
-     * 
-     * @param uid
-     */
+    @Override
     public void deleteWizardQuestionByUID(Long uid) {
 	qaWizardDAO.deleteWizardQuestionByUID(uid);
     }
 
-    /**
-     * Deletes all categories, sub skills and sub questions
-     */
+    @Override
     public void deleteAllWizardCategories() {
 	qaWizardDAO.deleteAllWizardCategories();
     }
 
+    @Override
     public void removeQuestionsFromCache(QaContent qaContent) {
 	qaDAO.removeQuestionsFromCache(qaContent);
     }
     
+    @Override
     public void removeQaContentFromCache(QaContent qaContent) {
 	qaDAO.removeQaContentFromCache(qaContent);
     }
 
+    @Override
     public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) {
 	return getQaOutputFactory().getSupportedDefinitionClasses(definitionType);
     }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaUtils.java
===================================================================
diff -u -ra7661f206a3f21114f1c05f9a29f56e20f5e35f0 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaUtils.java	(.../QaUtils.java)	(revision a7661f206a3f21114f1c05f9a29f56e20f5e35f0)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaUtils.java	(.../QaUtils.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -197,21 +197,4 @@
 	request.getSession().removeAttribute(USER_EXCEPTION_QUESTIONS_DUPLICATE);
     }
 
-    /**
-     * 
-     * @param request
-     * @param value
-     * @param toolContentID
-     */
-    public static void setDefineLater(HttpServletRequest request, boolean value, String strToolContentID,
-	    IQaService qaService) {
-
-	QaContent qaContent = qaService.getQaContent(new Long(strToolContentID).longValue());
-
-	if (qaContent != null) {
-	    qaContent.setDefineLater(value);
-	    qaService.updateQaContent(qaContent);
-	}
-    }
-
 }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java
===================================================================
diff -u -ra7661f206a3f21114f1c05f9a29f56e20f5e35f0 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java	(.../AuthoringUtil.java)	(revision a7661f206a3f21114f1c05f9a29f56e20f5e35f0)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java	(.../AuthoringUtil.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -56,105 +56,8 @@
  */
 public class AuthoringUtil implements QaAppConstants {
 
-    protected static List<QaQuestionDTO> swapQuestions(List<QaQuestionDTO> questionDTOs, String questionIndex,
-	    String direction, Set<QaCondition> conditions) {
 
-	int intQuestionIndex = new Integer(questionIndex).intValue();
-	int intOriginalQuestionIndex = intQuestionIndex;
 
-	int replacedQuestionIndex = 0;
-	if (direction.equals("down")) {
-	    // direction down
-	    replacedQuestionIndex = ++intQuestionIndex;
-	} else {
-	    // direction up
-	    replacedQuestionIndex = --intQuestionIndex;
-	}
-
-	QaQuestionDTO mainQuestion = getQuestionAtDisplayOrder(questionDTOs, intOriginalQuestionIndex);
-
-	QaQuestionDTO replacedQuestion = getQuestionAtDisplayOrder(questionDTOs, replacedQuestionIndex);
-
-	List<QaQuestionDTO> newQuestionDtos = new LinkedList<QaQuestionDTO>();
-
-	Iterator<QaQuestionDTO> iter = questionDTOs.iterator();
-	while (iter.hasNext()) {
-	    QaQuestionDTO questionDTO = iter.next();
-	    QaQuestionDTO tempQuestion = null;
-
-	    if (!questionDTO.getDisplayOrder().equals(new Integer(intOriginalQuestionIndex).toString())
-		    && !questionDTO.getDisplayOrder().equals(new Integer(replacedQuestionIndex).toString())) {
-		// normal copy
-		tempQuestion = questionDTO;
-
-	    } else if (questionDTO.getDisplayOrder().equals(new Integer(intOriginalQuestionIndex).toString())) {
-		// move type 1
-		tempQuestion = replacedQuestion;
-
-	    } else if (questionDTO.getDisplayOrder().equals(new Integer(replacedQuestionIndex).toString())) {
-		// move type 1
-		tempQuestion = mainQuestion;
-	    }
-
-	    newQuestionDtos.add(tempQuestion);
-	}
-
-	// references in conditions also need to be changed
-	if (conditions != null) {
-	    for (QaCondition condition : conditions) {
-		SortedSet<QaQuestionDTO> newQuestionDTOSet = new TreeSet<QaQuestionDTO>(
-			new QaQuestionContentDTOComparator());
-		for (QaQuestionDTO dto : (List<QaQuestionDTO>) newQuestionDtos) {
-		    if (condition.temporaryQuestionDTOSet.contains(dto)) {
-			newQuestionDTOSet.add(dto);
-		    }
-		}
-		condition.temporaryQuestionDTOSet = newQuestionDTOSet;
-	    }
-	}
-
-	return newQuestionDtos;
-    }
-
-    private static QaQuestionDTO getQuestionAtDisplayOrder(List<QaQuestionDTO> questionDTOs,
-	    int intOriginalQuestionIndex) {
-
-	Iterator<QaQuestionDTO> iter = questionDTOs.iterator();
-	while (iter.hasNext()) {
-	    QaQuestionDTO qaQuestionDTO = iter.next();
-	    if (new Integer(intOriginalQuestionIndex).toString().equals(qaQuestionDTO.getDisplayOrder())) {
-		return qaQuestionDTO;
-	    }
-	}
-	return null;
-    }
-
-    protected static List<QaQuestionDTO> reorderQuestionDTOs(List<QaQuestionDTO> questionDTOs) {
-	List<QaQuestionDTO> listFinalQuestionDTO = new LinkedList<QaQuestionDTO>();
-
-	int queIndex = 0;
-	Iterator<QaQuestionDTO> iter = questionDTOs.iterator();
-	while (iter.hasNext()) {
-	    QaQuestionDTO qaQuestionDTO = iter.next();
-
-	    String question = qaQuestionDTO.getQuestion();
-	    String feedback = qaQuestionDTO.getFeedback();
-	    boolean required = qaQuestionDTO.isRequired();
-
-	    if (question != null && !question.equals("")) {
-		++queIndex;
-
-		qaQuestionDTO.setQuestion(question);
-		qaQuestionDTO.setDisplayOrder(new Integer(queIndex).toString());
-		qaQuestionDTO.setFeedback(feedback);
-		qaQuestionDTO.setRequired(required);
-
-		listFinalQuestionDTO.add(qaQuestionDTO);
-	    }
-	}
-	return listFinalQuestionDTO;
-    }
-
     protected static List<QaQuestionDTO> reorderUpdateQuestionDTOs(List<QaQuestionDTO> questionDTOs,
 	    QaQuestionDTO qaQuestionContentDTONew, String editableQuestionIndex) {
 
@@ -193,8 +96,7 @@
     }
 
     public static QaContent saveOrUpdateQaContent(List<QaQuestionDTO> questionDTOs, IQaService qaService,
-	    HttpServletRequest request, QaContent qaContent, String strToolContentID,
-	    Set<QaCondition> conditions) {
+	    HttpServletRequest request, QaContent qaContent, String strToolContentID, Set<QaCondition> conditions) {
 	UserDTO toolUser = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
 
 	String richTextTitle = request.getParameter(QaAppConstants.TITLE);
@@ -314,8 +216,8 @@
 	}
 	qaContent.setConditions(conditions);
 	qaService.updateQaContent(qaContent);
-	
-	//persist questions
+
+	// persist questions
 	int displayOrder = 0;
 	for (QaQuestionDTO questionDTO : questionDTOs) {
 
@@ -336,19 +238,19 @@
 			questionDTO.isRequired(), qaContent);
 		qaContent.getQaQueContents().add(question);
 		question.setQaContent(qaContent);
-		
-	    // in case question exists already		
+
+		// in case question exists already
 	    } else {
 
 		question.setQuestion(questionText);
 		question.setFeedback(questionDTO.getFeedback());
 		question.setDisplayOrder(displayOrder);
 		question.setRequired(questionDTO.isRequired());
 	    }
-	    
+
 	    qaService.saveOrUpdateQuestion(question);
 	}
-	
+
 	return qaContent;
     }
 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java
===================================================================
diff -u -r52c8c1dcf1233af8cbd4e3447f318146a9975f41 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java	(.../LearningUtil.java)	(revision 52c8c1dcf1233af8cbd4e3447f318146a9975f41)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java	(.../LearningUtil.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -41,11 +41,9 @@
 import org.lamsfoundation.lams.web.util.AttributeNames;
 
 /**
- * 
  * Keeps all operations needed for Learning mode.
  * 
  * @author Ozgur Demirtas
- * 
  */
 public class LearningUtil implements QaAppConstants {
 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java
===================================================================
diff -u -ra7661f206a3f21114f1c05f9a29f56e20f5e35f0 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java	(.../QaAction.java)	(revision a7661f206a3f21114f1c05f9a29f56e20f5e35f0)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java	(.../QaAction.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -32,6 +32,7 @@
 import java.util.List;
 import java.util.Set;
 import java.util.SortedSet;
+import java.util.TreeSet;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -55,6 +56,7 @@
 import org.lamsfoundation.lams.tool.qa.dto.QaQuestionDTO;
 import org.lamsfoundation.lams.tool.qa.service.IQaService;
 import org.lamsfoundation.lams.tool.qa.service.QaServiceProxy;
+import org.lamsfoundation.lams.tool.qa.util.QaQuestionContentDTOComparator;
 import org.lamsfoundation.lams.tool.qa.util.QaUtils;
 import org.lamsfoundation.lams.tool.qa.web.form.QaAuthoringForm;
 import org.lamsfoundation.lams.util.WebUtil;
@@ -129,7 +131,7 @@
 	    if (mode.isTeacher()) {
 		Set<QaQueContent> oldQuestions = qaContent.getQaQueContents();
 		qaService.removeQuestionsFromCache(qaContent);
-		QaUtils.setDefineLater(request, false, strToolContentID, qaService);
+		qaService.setDefineLater(strToolContentID, false);
 		    
 		// recalculate User Answers
 		qaService.recalculateUserAnswers(qaContent, oldQuestions, questionDTOs, deletedQuestionDTOs);
@@ -616,9 +618,9 @@
 	SortedSet<QaCondition> conditionSet = (SortedSet<QaCondition>) sessionMap
 		.get(QaAppConstants.ATTR_CONDITION_SET);
 
-	questionDTOs = AuthoringUtil.swapQuestions(questionDTOs, questionIndex, "down", conditionSet);
+	questionDTOs = swapQuestions(questionDTOs, questionIndex, "down", conditionSet);
 
-	questionDTOs = AuthoringUtil.reorderQuestionDTOs(questionDTOs);
+	questionDTOs = reorderQuestionDTOs(questionDTOs);
 
 	sessionMap.put(QaAppConstants.LIST_QUESTION_DTOS, questionDTOs);
 
@@ -678,9 +680,9 @@
 
 	SortedSet<QaCondition> conditionSet = (SortedSet<QaCondition>) sessionMap
 		.get(QaAppConstants.ATTR_CONDITION_SET);
-	questionDTOs = AuthoringUtil.swapQuestions(questionDTOs, questionIndex, "up", conditionSet);
+	questionDTOs = swapQuestions(questionDTOs, questionIndex, "up", conditionSet);
 
-	questionDTOs = AuthoringUtil.reorderQuestionDTOs(questionDTOs);
+	questionDTOs = reorderQuestionDTOs(questionDTOs);
 
 	sessionMap.put(QaAppConstants.LIST_QUESTION_DTOS, questionDTOs);
 
@@ -724,7 +726,106 @@
 	request.setAttribute(QaAppConstants.TOTAL_QUESTION_COUNT, new Integer(questionDTOs.size()));
 	return mapping.findForward(QaAppConstants.LOAD_QUESTIONS);
     }
+    
+    private static List<QaQuestionDTO> swapQuestions(List<QaQuestionDTO> questionDTOs, String questionIndex,
+	    String direction, Set<QaCondition> conditions) {
 
+	int intQuestionIndex = new Integer(questionIndex).intValue();
+	int intOriginalQuestionIndex = intQuestionIndex;
+
+	int replacedQuestionIndex = 0;
+	if (direction.equals("down")) {
+	    // direction down
+	    replacedQuestionIndex = ++intQuestionIndex;
+	} else {
+	    // direction up
+	    replacedQuestionIndex = --intQuestionIndex;
+	}
+
+	QaQuestionDTO mainQuestion = getQuestionAtDisplayOrder(questionDTOs, intOriginalQuestionIndex);
+
+	QaQuestionDTO replacedQuestion = getQuestionAtDisplayOrder(questionDTOs, replacedQuestionIndex);
+
+	List<QaQuestionDTO> newQuestionDtos = new LinkedList<QaQuestionDTO>();
+
+	Iterator<QaQuestionDTO> iter = questionDTOs.iterator();
+	while (iter.hasNext()) {
+	    QaQuestionDTO questionDTO = iter.next();
+	    QaQuestionDTO tempQuestion = null;
+
+	    if (!questionDTO.getDisplayOrder().equals(new Integer(intOriginalQuestionIndex).toString())
+		    && !questionDTO.getDisplayOrder().equals(new Integer(replacedQuestionIndex).toString())) {
+		// normal copy
+		tempQuestion = questionDTO;
+
+	    } else if (questionDTO.getDisplayOrder().equals(new Integer(intOriginalQuestionIndex).toString())) {
+		// move type 1
+		tempQuestion = replacedQuestion;
+
+	    } else if (questionDTO.getDisplayOrder().equals(new Integer(replacedQuestionIndex).toString())) {
+		// move type 1
+		tempQuestion = mainQuestion;
+	    }
+
+	    newQuestionDtos.add(tempQuestion);
+	}
+
+	// references in conditions also need to be changed
+	if (conditions != null) {
+	    for (QaCondition condition : conditions) {
+		SortedSet<QaQuestionDTO> newQuestionDTOSet = new TreeSet<QaQuestionDTO>(
+			new QaQuestionContentDTOComparator());
+		for (QaQuestionDTO dto : (List<QaQuestionDTO>) newQuestionDtos) {
+		    if (condition.temporaryQuestionDTOSet.contains(dto)) {
+			newQuestionDTOSet.add(dto);
+		    }
+		}
+		condition.temporaryQuestionDTOSet = newQuestionDTOSet;
+	    }
+	}
+
+	return newQuestionDtos;
+    }
+    
+    private static QaQuestionDTO getQuestionAtDisplayOrder(List<QaQuestionDTO> questionDTOs,
+	    int intOriginalQuestionIndex) {
+
+	Iterator<QaQuestionDTO> iter = questionDTOs.iterator();
+	while (iter.hasNext()) {
+	    QaQuestionDTO qaQuestionDTO = iter.next();
+	    if (new Integer(intOriginalQuestionIndex).toString().equals(qaQuestionDTO.getDisplayOrder())) {
+		return qaQuestionDTO;
+	    }
+	}
+	return null;
+    }
+    
+    private static List<QaQuestionDTO> reorderQuestionDTOs(List<QaQuestionDTO> questionDTOs) {
+	List<QaQuestionDTO> listFinalQuestionDTO = new LinkedList<QaQuestionDTO>();
+
+	int queIndex = 0;
+	Iterator<QaQuestionDTO> iter = questionDTOs.iterator();
+	while (iter.hasNext()) {
+	    QaQuestionDTO qaQuestionDTO = iter.next();
+
+	    String question = qaQuestionDTO.getQuestion();
+	    String feedback = qaQuestionDTO.getFeedback();
+	    boolean required = qaQuestionDTO.isRequired();
+
+	    if (question != null && !question.equals("")) {
+		++queIndex;
+
+		qaQuestionDTO.setQuestion(question);
+		qaQuestionDTO.setDisplayOrder(new Integer(queIndex).toString());
+		qaQuestionDTO.setFeedback(feedback);
+		qaQuestionDTO.setRequired(required);
+
+		listFinalQuestionDTO.add(qaQuestionDTO);
+	    }
+	}
+	return listFinalQuestionDTO;
+    }
+
     /**
      * Get the deleted condition list, which could be persisted or non-persisted
      * items.
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java
===================================================================
diff -u -r7d0d609b844ea5e9c41f46d209825ce5bd4fb83a -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	(.../QaLearningAction.java)	(revision 7d0d609b844ea5e9c41f46d209825ce5bd4fb83a)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	(.../QaLearningAction.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -331,13 +331,8 @@
 	String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID);
 	String userID = request.getParameter("userID");
 	QaSession qaSession = QaLearningAction.qaService.getSessionById(new Long(toolSessionID).longValue());
-	Long toolContentID = qaSession.getQaContent().getQaContentId();
 	QaContent qaContent = qaSession.getQaContent();
-
-	String httpSessionID = qaLearningForm.getHttpSessionID();
-	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession().getAttribute(httpSessionID);
-	Map mapAnswers = (Map) sessionMap.get(QaAppConstants.MAP_ALL_RESULTS_KEY);
-
+	
 	// LearningUtil.storeResponses(mapAnswers, qaService, toolContentID, new Long(toolSessionID));
 	// mark response as finalised
 	QaQueUsr qaQueUsr = getCurrentUser(toolSessionID);
@@ -349,6 +344,7 @@
 
 	if (qaContent.isShowOtherAnswers()) {
 	    GeneralLearnerFlowDTO generalLearnerFlowDTO = LearningUtil.buildGeneralLearnerFlowDTO(qaContent);
+	    String httpSessionID = qaLearningForm.getHttpSessionID();
 	    generalLearnerFlowDTO.setHttpSessionID(httpSessionID);
 	    String isUserNamesVisibleBoolean = generalLearnerFlowDTO.getUserNameVisible();
 	    boolean isUserNamesVisible = new Boolean(isUserNamesVisibleBoolean).booleanValue();
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java
===================================================================
diff -u -refbaf6ddcc506fed7b594bc9b663b81a03b1283f -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	(.../QaLearningStarterAction.java)	(revision efbaf6ddcc506fed7b594bc9b663b81a03b1283f)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	(.../QaLearningStarterAction.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -72,20 +72,14 @@
 import org.lamsfoundation.lams.web.util.SessionMap;
 
 /**
+ * This class is used to load the default content and initialize the presentation Map for Learner mode.
+ * It is important that ALL the session attributes created in this action gets removed by: QaUtils.cleanupSession(request)
  * 
  * @author Ozgur Demirtas
  * 
- * This class is used to load the default content and initialize the
- * presentation Map for Learner mode
- * 
- * createToolSession will not be called once the tool is deployed.
- * 
- * It is important that ALL the session attributes created in this action gets
- * removed by: QaUtils.cleanupSession(request)
- * 
  */
 public class QaLearningStarterAction extends Action implements QaAppConstants {
-    static Logger logger = Logger.getLogger(QaLearningStarterAction.class.getName());
+    private static Logger logger = Logger.getLogger(QaLearningStarterAction.class.getName());
     
     private static IQaService qaService;
 
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java
===================================================================
diff -u -ra7661f206a3f21114f1c05f9a29f56e20f5e35f0 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java	(.../QaStarterAction.java)	(revision a7661f206a3f21114f1c05f9a29f56e20f5e35f0)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java	(.../QaStarterAction.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -132,7 +132,7 @@
 	ToolAccessMode mode = getAccessMode(request);
 	// request is from monitoring module
 	if (mode.isTeacher()) {
-	    QaUtils.setDefineLater(request, true, strToolContentID, qaService);
+	    qaService.setDefineLater(strToolContentID, true);
 	}
 	request.setAttribute(AttributeNames.ATTR_MODE, mode.toString());
 
Index: lams_tool_laqa/web/admin/config.jsp
===================================================================
diff -u -r35a0e719d061c08b52e705135bb2f2126079ed21 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_laqa/web/admin/config.jsp	(.../config.jsp)	(revision 35a0e719d061c08b52e705135bb2f2126079ed21)
+++ lams_tool_laqa/web/admin/config.jsp	(.../config.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -14,7 +14,6 @@
 		<script src="<lams:LAMSURL/>/includes/javascript/jquery-ui.js"></script>
 
 		<script type="text/javascript">
-		<!--
 			// Creating a 3-dimentional javascript array for category/cognitive skill/question
 			// -------------------------------------------------------------------------------
 			var categoryArray = new Array();
@@ -53,8 +52,7 @@
 				var qaWizardEnabledBox = document.laqa11AdminForm.qaWizardEnabled;
 				var wizardDiv = document.getElementById("wizardDiv");
 				
-				if (qaWizardEnabledBox.checked)
-				{
+				if (qaWizardEnabledBox.checked)	{
 					wizardDiv.style.display = "block";
 				}
 				
@@ -71,59 +69,48 @@
 				var i;
 				with (catMenu) {
 					options[0] = new Option("<fmt:message key="wizard.selectCategory" />", "none");
-					for(i = 0; i < categoryArray.length; i++)
-					{
+					for(i = 0; i < categoryArray.length; i++) {
 						options[i+1] = new Option(categoryArray[i].title, i);
 					} 
 					options[0].selected = true;
 				}
 			}
 			
 			// Edit an existing category
-			function editCategory(title, index)
-			{
+			function editCategory(title, index)	{
 				var cat = categoryArray[index];
 				cat.title = title;
 				categoryArray[index] = cat;
 			}
 			
 			// Edit an existing skill
-			function editSkill(title, catIndex, index)
-			{
+			function editSkill(title, catIndex, index)	{
 				var skill = categoryArray[catIndex].skills[index];
 				skill.title = title;
 				categoryArray[catIndex].skills[index] = skill;
 			}
 			
 			// Edit an existing question
-			function editQuestion(question, catIndex, skillIndex, index)
-			{
+			function editQuestion(question, catIndex, skillIndex, index){
 				var questionObj = categoryArray[catIndex].skills[skillIndex].questions[index];
 				questionObj.question = question;
 				categoryArray[catIndex].skills[skillIndex].questions[index] = questionObj;
 			}
 			
 			// Toggle the wizard view when the checkbox is selected
-			function toggleWizard()
-			{
+			function toggleWizard()	{
 				$("div.wizard").toggle("fast");
 			}
 			
 			// Delete a category
-			function deleteCategory()
-			{
-				if (catMenu.selectedIndex == null || catMenu.selectedIndex <= 0)
-				{
+			function deleteCategory(){
+				if (catMenu.selectedIndex == null || catMenu.selectedIndex <= 0){
 					alert("<fmt:message key="wizard.delete.notselected" />");
-				}
-				else
-				{
-					if (confirm("<fmt:message key="wizard.delete.warnDeleteCategory" />"))
-					{
+				} else {
+					if (confirm("<fmt:message key="wizard.delete.warnDeleteCategory" />")) {
 						var uid = categoryArray[catMenu.selectedIndex-1].uid;
 						
-						if(uid != null && uid)
-						{
+						if(uid != null && uid) {
 							deleteCategories[deleteCategories.length] = uid;
 						}
 						
@@ -135,20 +122,14 @@
 			}
 			
 			// Delete a skill
-			function deleteSkill()
-			{
-				if (skillMenu.selectedIndex == null || skillMenu.selectedIndex <= 0)
-				{
+			function deleteSkill() {
+				if (skillMenu.selectedIndex == null || skillMenu.selectedIndex <= 0) {
 					alert("<fmt:message key="wizard.delete.notselected" />");
-				}
-				else
-				{
-					if (confirm("<fmt:message key="wizard.delete.warnDeleteSkill" />"))
-					{
+				} else {
+					if (confirm("<fmt:message key="wizard.delete.warnDeleteSkill" />"))	{
 						var uid = categoryArray[catMenu.selectedIndex-1].skills[skillMenu.selectedIndex-1].uid;
 						
-						if(uid != null && uid)
-						{
+						if(uid != null && uid) {
 							deleteSkills[deleteSkills.length] = uid;
 						}
 						
@@ -160,20 +141,14 @@
 			}
 			
 			// Delete a question
-			function deleteQuestion()
-			{
-				if (qMenu.selectedIndex == null || qMenu.selectedIndex <= 0)
-				{
+			function deleteQuestion() {
+				if (qMenu.selectedIndex == null || qMenu.selectedIndex <= 0) {
 					alert("<fmt:message key="wizard.delete.notselected" />");
-				}
-				else
-				{
-					if (confirm("<fmt:message key="wizard.delete.warnDeleteQuestion" />"))
-					{
+				} else	{
+					if (confirm("<fmt:message key="wizard.delete.warnDeleteQuestion" />"))	{
 						var uid = categoryArray[catMenu.selectedIndex-1].skills[skillMenu.selectedIndex-1].questions[qMenu.selectedIndex-1].uid;
 						
-						if(uid != null && uid)
-						{
+						if(uid != null && uid) {
 							deleteQuestions[deleteQuestions.length] = uid;
 						}
 						
@@ -184,80 +159,61 @@
 				}
 			}
 			
-			function trim(str)
-			{
+			function trim(str) {
 				return str.replace(/^\s+|\s+$/g, '');
 			}
 			
 			// Special dialog for an edit
-			function editDialog(inputType, isAdd, titleStr, selectDDM)
-			{
-				if(selectDDM.selectedIndex != null && selectDDM.selectedIndex > 0)
-				{
+			function editDialog(inputType, isAdd, titleStr, selectDDM) {
+				if(selectDDM.selectedIndex != null && selectDDM.selectedIndex > 0) {
 					var existingString = selectDDM.options[selectDDM.selectedIndex].text;
 					document.getElementById('inputText').value = existingString;
 					openDialog(inputType, isAdd, titleStr);
-				}
-				else
-				{
+				} else {
 					alert("<fmt:message key="wizard.edit.notSelected" />");
 				}
 			}
 			
 			// Opens the required dialog based on the parameters
-			function openDialog(inputType, isAdd, titleStr)
-			{
+			function openDialog(inputType, isAdd, titleStr)	{
 
 				disableExport();
 				$("#catDialog").dialog("close");
-				$("#catDialog").dialog(
-					{ 
-				    	buttons: 
-				    	{ 
-					        "<fmt:message key="wizard.ok" />": function() 
-					        { 
-					            if(handleDialogInput(inputType, isAdd))
-					            {
-									document.getElementById('inputText').value = "";
-					            	$(this).dialog("close"); 
-					            }
-					        }, 
-					       "<fmt:message key="label.cancel" />": function() 
-					        { 
-					            document.getElementById('inputText').value = "";
-					            $(this).dialog("close"); 
-					        } 
-					    },
-					    height: 120,
-					    width: 725,
-					    title: titleStr,
-					    position: [33,290 + dialogOffSet]
-					}
-				);
+				$("#catDialog").dialog({ 
+					buttons: { 
+						"<fmt:message key="wizard.ok" />": function() { 
+					    	if(handleDialogInput(inputType, isAdd)) {
+								document.getElementById('inputText').value = "";
+					        	$(this).dialog("close"); 
+					        }
+					    }, 
+					    "<fmt:message key="label.cancel" />": function() { 
+					    	document.getElementById('inputText').value = "";
+					    	$(this).dialog("close"); 
+					    } 
+					},
+					height: 120,
+					width: 725,
+					title: titleStr,
+					position: [33,290 + dialogOffSet]
+				});
 				document.getElementById("inputText").focus();
 			}
 			
-			function handleDialogInput(inputType, isAdd)
-			{
+			function handleDialogInput(inputType, isAdd){
 				var inputText = trim(document.getElementById("inputText").value);
-				if (inputText == null || inputText == "")
-				{
+				if (inputText == null || inputText == ""){
 					alert("<fmt:message key="wizard.edit.fieldRequired" />");
 					return false
 				}
 
-				if (inputType=="category")
-				{
-					with (catMenu) 
-		            {
-						if (isAdd)
-						{
+				if (inputType=="category")	{
+					with (catMenu) {
+						if (isAdd) {
 							addCategory(inputText, null, categoryArray.length, true);
 							setUpTripleMenu();
 							options[categoryArray.length].selected = true;
-						}
-						else
-						{
+						} else {
 							editCategory(inputText, catMenu.selectedIndex -1);
 							var indexSelect = catMenu.selectedIndex;
 							setUpTripleMenu();
@@ -267,61 +223,43 @@
 						}
 						
 					}
-				}
-				else if (inputType=="skill")
-				{
-					with (skillMenu) 
-		            {
+				} else if (inputType=="skill") {
+					with (skillMenu) {
 					
-						if (isAdd)
-						{
-							if (catMenu.selectedIndex != null && catMenu.selectedIndex > 0)
-							{
+						if (isAdd) {
+							if (catMenu.selectedIndex != null && catMenu.selectedIndex > 0) {
 								addSkill(inputText, null, catMenu.selectedIndex - 1 , categoryArray[catMenu.selectedIndex - 1].skills.length);
 								changeCategory();
 								options[options.length -1].selected = true;
 								
-							}
-							else
-							{
+							} else {
 								alert("<fmt:message key="wizard.add.mustSelectCategory" />");
 								return false;
 							}
-						}
-						else
-						{
+						} else {
 							editSkill(inputText, catMenu.selectedIndex -1, skillMenu.selectedIndex -1);
 							indexSelect = skillMenu.selectedIndex;
 							changeCategory();
 							options[indexSelect].selected = true;
 							changeSkill();
 						}
 					}
-				}
-				else if (inputType=="question")
-				{
-					with (qMenu) 
-		            {
+				} else if (inputType=="question") {
+					with (qMenu) {
 						var catIndex = catMenu.selectedIndex - 1;
 						var skillIndex = skillMenu.selectedIndex -1;
-						if (isAdd)
-						{
-							if (catMenu.selectedIndex != null && catMenu.selectedIndex > 0 && skillMenu.selectedIndex != null && skillMenu.selectedIndex > 0 )
-							{
+						if (isAdd) {
+							if (catMenu.selectedIndex != null && catMenu.selectedIndex > 0 && skillMenu.selectedIndex != null && skillMenu.selectedIndex > 0 )	{
 								var qIndex = categoryArray[catIndex].skills[skillIndex].questions.length;
 								addQuestion(inputText, null, catIndex, skillIndex, qIndex)
 								changeSkill();
 								options[options.length -1].selected = true;
-							}
-							else
-							{
+							} else {
 								alert("<fmt:message key="wizard.add.mustSelectSkill" />");
 								return false;
 							}
 							
-						}
-						else
-						{
+						} else {
 							var indexSelect = qMenu.selectedIndex;
 							editQuestion(inputText, catIndex, skillIndex, indexSelect -1)
 							changeSkill();
@@ -333,30 +271,25 @@
 			}
 			
 			// Serialises the javascript data befor performing the submit
-			function submitForm(dispatch)
-			{
+			function submitForm(dispatch) {
 				// Serialise the categores, skills an questions in the 3d array
 				// into an xml string
-				if (categoryArray.length > 0)
-				{
+				if (categoryArray.length > 0) {
 					var xmlString = '<?xml version="1.0"?><categories>';
 					var i, j, k;
-					for (i=0; i<categoryArray.length; i++)
-					{
+					for (i=0; i<categoryArray.length; i++) {
 						var categoryString = '<category'+
 							' uid="' + categoryArray[i].uid + '"'+
 							' title="' + escape(categoryArray[i].title) + '"'+
 							' >';
 					
-						for(j=0; j<categoryArray[i].skills.length; j++)
-						{
+						for(j=0; j<categoryArray[i].skills.length; j++)	{
 							var skillString = '<skill'+
 								' uid="'+ categoryArray[i].skills[j].uid + '"'+
 								' title="'+ escape(categoryArray[i].skills[j].title) + '"'+
 								' >';
 							
-							for (k=0; k<categoryArray[i].skills[j].questions.length; k++)
-							{
+							for (k=0; k<categoryArray[i].skills[j].questions.length; k++) {
 								var questionString = '<question'+
 									' uid="'+ categoryArray[i].skills[j].questions[k].uid + '"'+
 									' question="'+ escape(categoryArray[i].skills[j].questions[k].question) + '"'+
@@ -374,36 +307,30 @@
 				}
 				
 				// serialise the deleted catergories
-				if (deleteCategories.length >0)
-				{
+				if (deleteCategories.length >0) {
 					var i;
 					var CSV = deleteCategories[0];
-					for (i=1; i< deleteCategories.length; i++)
-					{
+					for (i=1; i< deleteCategories.length; i++) {
 						CSV += "," + deleteCategories[i];
 					}
 					document.getElementById("deleteCategoriesCSV").value = CSV;
 				}
 				
 				// serialise the deleted skills
-				if (deleteSkills.length >0)
-				{
+				if (deleteSkills.length >0) {
 					var i;
 					var CSV = deleteSkills[0];
-					for (i=1; i< deleteSkills.length; i++)
-					{
+					for (i=1; i< deleteSkills.length; i++) {
 						CSV += "," + deleteSkills[i];
 					}
 					document.getElementById("deleteSkillsCSV").value = CSV;
 				}
 				
 				// serialise the deleted questions
-				if (deleteQuestions.length >0)
-				{
+				if (deleteQuestions.length >0) {
 					var i;
 					var CSV = deleteQuestions[0];
-					for (i=1; i< deleteQuestions.length; i++)
-					{
+					for (i=1; i< deleteQuestions.length; i++) {
 						CSV += "," + deleteQuestions[i];
 					}
 					document.getElementById("deleteQuestionsCSV").value = CSV;
@@ -413,37 +340,26 @@
 				document.laqa11AdminForm.submit();
 			}
 			
-			function customSubmit(dispatch)
-			{
+			function customSubmit(dispatch) {
 				document.getElementById("dispatch").value = dispatch;
 				document.laqa11AdminForm.submit();
 			}
 			
-			function disableExport()
-			{
+			function disableExport() {
 				msg = "<fmt:message key="wizard.export.savefirst" />"
 				document.getElementById("exportButton").href = "javascript:alert('" + msg + "');";
 			}
 			
-			function importFile()
-			{
-				if (document.getElementById("importFile").value.length == 0)	
-				{
+			function importFile() {
+				if (document.getElementById("importFile").value.length == 0) {
 					alert("<fmt:message key='wizard.import.nofile'/>");
-				}
-				else
-				{
-					if(confirm("<fmt:message key="wizard.import.warn" />"))
-					{
+				} else {
+					if(confirm("<fmt:message key="wizard.import.warn" />")) {
 						customSubmit("importWizard");
 					}
 				}
 			}
-		//-->
 		</script>
-	
-		
-	
 	</lams:head>
 	
 	<body class="stripes" onload="javascript:setUpTripleMenu();">
@@ -455,8 +371,6 @@
 		</h1>
 		
 		<a href="<lams:LAMSURL/>/admin/sysadminstart.do"><fmt:message key="admin.return" /></a>
-	
-		
 
 		<c:if test="${error}">
 			<p class="warning">
@@ -489,7 +403,6 @@
 			</script>
 		</c:if>
 		
-		
 		<html:form action="/laqa11admin" styleId="laqa11AdminForm" method="post" enctype="multipart/form-data">
 			<html:hidden property="serialiseXML" styleId="serialiseXML" value="" />
 			<html:hidden property="deleteCategoriesCSV" styleId="deleteCategoriesCSV" value="" />
@@ -513,6 +426,7 @@
 				<br />
 				<table border="0" cellspacing="10px">
 					<tbody>
+					
 					    <tr>
 					      	<td align="left" valign="top" width="300">
 								<select name="catMenu" onchange="changeCategory()" size="1" style="font-size:10px; width:100%;">
@@ -526,6 +440,7 @@
 					      		<a href='javascript:deleteCategory();' class="button"  ><fmt:message key="wizard.delete" /></a>
 					      	</td>
 					    </tr>
+					    
 					    <tr>
 					      	<td align="left" valign="top" width="300">
 						      	<select name="skillMenu" onchange="changeSkill()" size="1" style="font-size:10px; width:100%;">
@@ -539,6 +454,7 @@
 					      		<a href='javascript:deleteSkill();' class="button"  ><fmt:message key="wizard.delete" /></a>
 					      	</td>
 					    </tr>
+					    
 					    <tr>
 					      	<td align="left" valign="top" width="300">
 					      		<select name="qMenu" size="1" style="font-size:10px; width:100%;">
@@ -552,34 +468,40 @@
 					      		<a href='javascript:deleteQuestion();' class="button"  ><fmt:message key="wizard.delete" /></a>
 					      	</td>
 					    </tr>
+					    
 					</tbody>
 				</table>
 				<br />
-				<a href="javascript:customSubmit('exportWizard')" id="exportButton" class="button"  ><fmt:message key="wizard.export.export" /></a>
+				
+				<a href="javascript:customSubmit('exportWizard')" id="exportButton" class="button"  >
+					<fmt:message key="wizard.export.export" />
+				</a>
 				&nbsp;
-				<a href="javascript:importFile()" class="button"  ><fmt:message key="wizard.import.import" /></a>
+				
+				<a href="javascript:importFile()" class="button"  >
+					<fmt:message key="wizard.import.import" />
+				</a>
+				
 				<html:file property="importFile" styleId="importFile" />
 				<br />
 				<br />
 				<br />
 				<br />
 			</div>
 		
-			<a href="javascript:submitForm('saveContent')" class="button"  ><fmt:message key="label.save" /></a>
-
+			<a href="javascript:submitForm('saveContent')" class="button"  >
+				<fmt:message key="label.save" />
+			</a>
 		
 			<div id="dialogDiv" style="display: none;">
 				<div id="catDialog" class="ui-dialog ui-draggable ui-resizable">
 					<input type="text" id="inputText" width="255" size="90">
 				</div>	
 			</div>
 		</html:form>	
-		</div>
-		<!--closes content-->
+		</div><!--closes content-->
 	
-		<div id="footer">
-		</div>
-		<!--closes footer-->
+		<div id="footer"></div><!--closes footer-->
 	</body>
 
 </head>
\ No newline at end of file
Index: lams_tool_laqa/web/export/exportportfolio.jsp
===================================================================
diff -u -r55acfa2355b842ad87bac70171e366e088daad3c -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_laqa/web/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 55acfa2355b842ad87bac70171e366e088daad3c)
+++ lams_tool_laqa/web/export/exportportfolio.jsp	(.../exportportfolio.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -98,7 +98,7 @@
 													<c:when
 														test="${generalLearnerFlowDTO.userUid == userData.queUsrId or userData.visible == 'true'}">
 														<c:out value="${userData.responsePresentable}" escapeXml="true" />
-														<jsp:include page="../learning/parts/ratingStarsDisabled.jsp" />
+														<jsp:include page="../learning/atingStarsDisabled.jsp" />
 													</c:when>
 													<c:otherwise>
 														<i><fmt:message key="label.hidden" /> </i>
@@ -176,7 +176,7 @@
 													</c:if>
 													<c:out value="${userData.responsePresentable}"
 														escapeXml="false" />
-													<jsp:include page="../learning/parts/ratingStarsDisabled.jsp" />
+													<jsp:include page="../learning/ratingStarsDisabled.jsp" />
 												</td>
 											</tr>
 
Index: lams_tool_laqa/web/includes/jsp/qaWizardCommon.jsp
===================================================================
diff -u -rce3e782fd6844641f7298e09104f8d7554f073ff -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_laqa/web/includes/jsp/qaWizardCommon.jsp	(.../qaWizardCommon.jsp)	(revision ce3e782fd6844641f7298e09104f8d7554f073ff)
+++ lams_tool_laqa/web/includes/jsp/qaWizardCommon.jsp	(.../qaWizardCommon.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -1,10 +1,8 @@
 <!-- Javascript functions used for q&a wizard, made into jsp for language tags  -->
 <script language="JavaScript" type="text/JavaScript">
-<!--
 	
 	// Add a category to the categoryArray
-	function addCategory(title, uid, index)
-	{
+	function addCategory(title, uid, index) {
 		var cat = new Object();
 		cat.title = title;
 		cat.uid = uid;
@@ -13,8 +11,7 @@
 	}
 	
 	// Adds a skill object to the skill array (containted in the category array)
-	function addSkill(title, uid, catIndex, index)
-	{
+	function addSkill(title, uid, catIndex, index) {
 		var skill = new Object();
 		skill.title = title;
 		skill.uid = uid;
@@ -23,8 +20,7 @@
 	}
 	
 	// Adds a question object to the question array, (contained within the skill array0
-	function addQuestion(question, uid, catIndex, skillIndex, index)
-	{
+	function addQuestion(question, uid, catIndex, skillIndex, index) {
 		var questionObj = new Object();
 		questionObj.uid = uid;
 		questionObj.question = question;
@@ -37,8 +33,7 @@
 	}
 	
 	// Changes a category when it is selected, the skills options are populated with the corresponding data
-	function changeCategory() 
-	{
+	function changeCategory() {
 		nullOptions(skillMenu);
 		nullOptions(qMenu);
 	
@@ -59,24 +54,20 @@
 	}
 	
 	// Changes a skill when selected, the questions options are poulated with the corresponding data
-	function changeSkill() 
-	{
+	function changeSkill() {
 		nullOptions(qMenu);
 	
-		if (catMenu.selectedIndex != 0 && skillMenu.selectedIndex != 0)
-		{
+		if (catMenu.selectedIndex != 0 && skillMenu.selectedIndex != 0){
 			var questionArray = categoryArray[catMenu.selectedIndex -1].skills[skillMenu.selectedIndex -1].questions;
 			
 			var i;
 			with (qMenu) {
 				options[0] = new Option("<fmt:message key="wizard.selectQuestion" />", "none");
-				for(i = 0; i < questionArray.length; i++)
-				{
+				for(i = 0; i < questionArray.length; i++) {
 					options[i+1] = new Option(questionArray[i].question, i);
 				} 
 				options[0].selected = true;
 			}
 		}
 	}
-//-->
 </script>
\ No newline at end of file
Index: lams_tool_laqa/web/learning/AnswersContent.jsp
===================================================================
diff -u -r52c8c1dcf1233af8cbd4e3447f318146a9975f41 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_laqa/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 52c8c1dcf1233af8cbd4e3447f318146a9975f41)
+++ lams_tool_laqa/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -30,7 +30,9 @@
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
  	<script type="text/javascript" src="${lams}includes/javascript/jquery.form.js"></script>
- 	<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>	
+	<link href="jquery.jgrowl.min.css" rel="stylesheet"/>
+
+	<script type="text/javascript" src="jquery.jgrowl.min.js"></script>	
 	<script language="JavaScript" type="text/JavaScript">
 	
 		function submitMethod(actionMethod) {
@@ -81,7 +83,7 @@
 		//autoSaveAnswers if hasEditRight
 		if (${hasEditRight}) {
 				
-			var interval = "30000"; // = 30 seconds
+			var interval = "5000"; // = 30 seconds
 			window.setInterval(
 				function(){
 					//fire onchange event for lams:textarea
@@ -90,10 +92,11 @@
 					$('#learningForm').ajaxSubmit({
 						url: "<c:url value='/learning.do?method=autoSaveAnswers&date='/>" + new Date().getTime(),
 			               success: function() {
-			               	$.growlUI('<fmt:message key="label.learning.draft.autosaved" />');
+			               	$.jGrowl('<fmt:message key="label.learning.draft.autosaved" />');
 			               }
 					});
-		       	}, interval
+		       	}, 
+		       	interval
 		   );
 		}
 		
@@ -193,14 +196,3 @@
 
 </body>
 </lams:html>
-
-
-
-
-
-
-
-
-
-
-
Index: lams_tool_laqa/web/learning/LearnerRep.jsp
===================================================================
diff -u -r7d0d609b844ea5e9c41f46d209825ce5bd4fb83a -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 7d0d609b844ea5e9c41f46d209825ce5bd4fb83a)
+++ lams_tool_laqa/web/learning/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"  "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
 
@@ -239,7 +238,7 @@
 				
 				<c:set var="userData" scope="request" value="${userResponse}" />
 				<c:set var="responseUid" scope="request" value="${userResponse.responseId}" />
-				<jsp:include page="parts/ratingStarsDisabled.jsp" />				
+				<jsp:include page="ratingStarsDisabled.jsp" />				
 				
 			</div>
 		</c:forEach>
Index: lams_tool_laqa/web/learning/Notebook.jsp
===================================================================
diff -u -r6ac8c3a8a953aab157cb5075fba73b09da5e4cf8 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_laqa/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 6ac8c3a8a953aab157cb5075fba73b09da5e4cf8)
+++ lams_tool_laqa/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
 
@@ -17,17 +16,15 @@
 	<title><fmt:message key="activity.title" /></title>
 
 	<script language="JavaScript" type="text/JavaScript">
-		function submitLearningMethod(actionMethod) 
-		{
+		function submitLearningMethod(actionMethod) {
 			if (actionMethod == 'submitReflection') {
 				document.getElementById("finishButton").disabled = true;
 			}		
 			document.QaLearningForm.method.value=actionMethod; 
 			document.QaLearningForm.submit();
 		}
 		
-		function submitMethod(actionMethod) 
-		{
+		function submitMethod(actionMethod) {
 			submitLearningMethod(actionMethod);
 		}
 		
@@ -45,17 +42,14 @@
 		<div id="content">
 
 			<h1>
-				<lams:out value="${generalLearnerFlowDTO.activityTitle}"
-					escapeHtml="true" />
+				<lams:out value="${generalLearnerFlowDTO.activityTitle}" escapeHtml="true" />
 			</h1>
 
 			<p>
-				<lams:out value="${generalLearnerFlowDTO.reflectionSubject}"
-					escapeHtml="true" />
+				<lams:out value="${generalLearnerFlowDTO.reflectionSubject}" escapeHtml="true" />
 			</p>
 
-			<html:textarea cols="60" rows="8" property="entryText"
-				styleClass="text-area"></html:textarea>
+			<html:textarea cols="60" rows="8" property="entryText" styleClass="text-area"></html:textarea>
 
 			<div class="space-bottom-top align-right">
 				<html:link href="#nogo" property="submitReflection" styleId="finishButton"
Index: lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
===================================================================
diff -u -r7d0d609b844ea5e9c41f46d209825ce5bd4fb83a -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision 7d0d609b844ea5e9c41f46d209825ce5bd4fb83a)
+++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
 
@@ -238,7 +237,7 @@
 				
 				<c:set var="userData" scope="request" value="${userResponse}" />
 				<c:set var="responseUid" scope="request" value="${userResponse.responseId}" />
-				<jsp:include page="parts/ratingStarsDisabled.jsp" />
+				<jsp:include page="ratingStarsDisabled.jsp" />
 				
 			</div>
 		</c:forEach>
@@ -318,7 +317,6 @@
 			    </tr>
 			</table>
 			
-			
 			<c:if test="${hasEditRight}">
 				<html:button property="forwardtoReflection" styleClass="button" onclick="submitMethod('forwardtoReflection');"> 
 					<fmt:message key="label.edit" />
Index: lams_tool_laqa/web/learning/defineLater.jsp
===================================================================
diff -u -r96624ae172b4b193603927a3d39c54572e0d6b4c -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_laqa/web/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 96624ae172b4b193603927a3d39c54572e0d6b4c)
+++ lams_tool_laqa/web/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -26,15 +26,10 @@
 
 	<div id="footer"></div>
 
-
 </body>
 </lams:html>
 
 
 
 
 
-
-
-
-
Index: lams_tool_laqa/web/learning/mobile/AnswersContent.jsp
===================================================================
diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_laqa/web/learning/mobile/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision be07c35c372d904a65581d98660e73f3b13b69db)
+++ lams_tool_laqa/web/learning/mobile/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -35,68 +35,15 @@
  	<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>	
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 	<script language="JavaScript" type="text/JavaScript">
-	
-		function submitMethod(actionMethod) {
-			var submit = true;
-			if (actionMethod != 'getPreviousQuestion') {
-				jQuery(".text-area").each(function() {
-					if (jQuery.trim($(this).val()) == "") {
-						if (confirm("<fmt:message key="warning.empty.answers" />")) {
-							doSubmit(actionMethod);
-							return false;
-						} else {
-							this.focus();
-							//return submit = false;
-							return false;
-						}
-					}
-				});
-			}
-			if (submit) {
-				doSubmit(actionMethod);
-			}
-		}
+
 		
-		function doSubmit(actionMethod) {
-			document.QaLearningForm.method.value=actionMethod; 
-			document.QaLearningForm.submit();
-		}
-		
-		if (${!hasEditRight && mode != "teacher"}) {
-			setInterval("checkLeaderProgress();",60000);// Auto-Refresh every 1 minute for non-leaders
-		}
-		
-		function checkLeaderProgress() {
-			
-	        $.ajax({
-	        	async: false,
-	            url: '<c:url value="/learning.do"/>',
-	            data: 'method=checkLeaderProgress&toolSessionID=' + $("#tool-session-id").val(),
-	            dataType: 'json',
-	            type: 'post',
-	            success: function (json) {
-	            	if (json.isLeaderResponseFinalized) {
-	            		location.reload();
-	            	}
-	            }
-	       	});
-		}
-		
 		//autoSaveAnswers if hasEditRight
 		if (${hasEditRight}) {
 				
-			var interval = "30000"; // = 30 seconds
+			var interval = "3000"; // = 30 seconds
 			window.setInterval(
 				function(){
-					//fire onchange event for lams:textarea
-					$("[id$=__lamstextarea]").change();
-					//ajax form submit
-					$('#learningForm').ajaxSubmit({
-						url: "<c:url value='/learning.do?method=autoSaveAnswers&date='/>" + new Date().getTime(),
-			               success: function() {
 			               	$.growlUI('<fmt:message key="label.learning.draft.autosaved" />');
-			               }
-					});
 		       	}, interval
 		   );
 		}
@@ -114,22 +61,6 @@
 	</div><!-- /header -->
 
 	<div data-role="content">	
-	
-		<c:if test="${not empty sessionMap.submissionDeadline}">
-			<div class="info">
-				<fmt:message key="authoring.info.teacher.set.restriction" >
-					<fmt:param><lams:Date value="${sessionMap.submissionDeadline}" /></fmt:param>
-				</fmt:message>
-			</div>
-		</c:if>	
-				
-		<c:if test="${isLeadershipEnabled}">
-			<h4>
-				<fmt:message key="label.group.leader" >
-					<fmt:param>${sessionMap.groupLeader.fullname}</fmt:param>
-				</fmt:message>
-			</h4>
-		</c:if>
 		
 
 		<html:form action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self"  styleId="learningForm">
@@ -147,53 +78,40 @@
 			<html:hidden property="httpSessionID" />
 			<html:hidden property="questionIndex" />
 			<html:hidden property="totalQuestionCount" />
-
-			<logic:messagesPresent>
-				<p class="warning">
-				  	<html:messages id="error" message="false"> 
-            			<c:out value="${error}" escapeXml="false"/><BR> 
-         			</html:messages> 
-				</p>
-			</logic:messagesPresent>
 			
 			<p>
 				<c:out value="${generalLearnerFlowDTO.activityInstructions}" escapeXml="false" />
 			</p>
 			
-			<c:choose>
-				<c:when test="${(generalLearnerFlowDTO.questionListingMode == 'questionListingModeSequential') && hasEditRight}">
-
-					<c:if test="${generalLearnerFlowDTO.totalQuestionCount != 1}">
-						<c:if test="${generalLearnerFlowDTO.initialScreen == 'true'}">
-							<p><fmt:message key="label.feedback.seq" />
-								<c:out value="${generalLearnerFlowDTO.remainingQuestionCount}" />
-								<fmt:message key="label.questions.simple" />
+			<ul data-role="listview"  >
+			<c:forEach var="dto" varStatus="status"	items="${generalLearnerFlowDTO.mapAnswers}">
+			
+				<li>
+							<p class="space-top">
+							 	asdasdasdasd
 							</p>
-						</c:if>
-					</c:if>
-
-					<c:if test="${generalLearnerFlowDTO.initialScreen != 'true'}">
-						<p>
-							<fmt:message key="label.questions.remaining" />
-							<c:out value="${generalLearnerFlowDTO.remainingQuestionCount}" />
-						</p>
-					</c:if>
-
-					<jsp:include page="/learning/mobile/SequentialAnswersContent.jsp" />
-				</c:when>
-
-				<c:otherwise>
-					<c:if test="${generalLearnerFlowDTO.totalQuestionCount != 1}">
-						<fmt:message key="label.feedback.combined" /> &nbsp <c:out
-							value="${generalLearnerFlowDTO.remainingQuestionCount}" />
-						<fmt:message key="label.questions.simple" />
-					</c:if>						
-					<jsp:include page="/learning/mobile/CombinedAnswersContent.jsp" />
-				</c:otherwise>
-			</c:choose>
-
+								
+							<p class="small-space-top">
+								<strong><fmt:message key="label.answer" /></strong>
+							</p>
+								
+							<div class="small-space-bottom">
+										<lams:textarea name="answeraaa" rows="5" cols="60" class="text-area" ><c:out value='aaaa' escapeXml='false' /></lams:textarea>
+			
+			
+							</div>
+				</li>
+			</c:forEach>
+			</ul>
 		</html:form>
+			
+			</div><!-- /page div -->
+			
+			<div data-role="footer" data-theme="b">
+				<h2>&nbsp;</h2>
+			</div><!-- /footer -->
 
+
 </div>
 </body>
 </lams:html>
Index: lams_tool_laqa/web/learning/mobile/LearnerRep.jsp
===================================================================
diff -u -r7d0d609b844ea5e9c41f46d209825ce5bd4fb83a -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_laqa/web/learning/mobile/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 7d0d609b844ea5e9c41f46d209825ce5bd4fb83a)
+++ lams_tool_laqa/web/learning/mobile/LearnerRep.jsp	(.../LearnerRep.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -263,7 +263,7 @@
 									
 					<c:set var="userData" scope="request" value="${userResponse}" />
 					<c:set var="responseUid" scope="request" value="${userResponse.responseId}" />
-					<jsp:include page="parts/ratingStarsDisabled.jsp" />
+					<jsp:include page="ratingStarsDisabled.jsp" />
 					
 				</li>
 			</c:forEach>	
Index: lams_tool_laqa/web/learning/mobile/RevisitedLearnerRep.jsp
===================================================================
diff -u -r7d0d609b844ea5e9c41f46d209825ce5bd4fb83a -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_laqa/web/learning/mobile/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision 7d0d609b844ea5e9c41f46d209825ce5bd4fb83a)
+++ lams_tool_laqa/web/learning/mobile/RevisitedLearnerRep.jsp	(.../RevisitedLearnerRep.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -247,7 +247,7 @@
 										<p class="space-bottom user-answer">
 											<c:out value="${userData.responsePresentable}" escapeXml="false" />
 										</p>
-										<jsp:include page="parts/ratingStarsDisabled.jsp" />
+										<jsp:include page="ratingStarsDisabled.jsp" />
 									</c:if>
 							</c:if>								
 						</c:forEach>
Fisheye: Tag 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5 refers to a dead (removed) revision in file `lams_tool_laqa/web/learning/mobile/parts/ratingStars.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5 refers to a dead (removed) revision in file `lams_tool_laqa/web/learning/mobile/parts/ratingStarsDisabled.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_laqa/web/learning/mobile/ratingStarsDisabled.jsp
===================================================================
diff -u
--- lams_tool_laqa/web/learning/mobile/ratingStarsDisabled.jsp	(revision 0)
+++ lams_tool_laqa/web/learning/mobile/ratingStarsDisabled.jsp	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -0,0 +1,22 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<c:if test="${generalLearnerFlowDTO.allowRateAnswers == 'true'}">
+	<div class="rating-stars-div">
+		<div class="rating-stars-disabled" data-average="${userData.averageRating}" data-id="${responseUid}"></div>
+		<div class="rating-stars-caption">
+		
+			<fmt:message key="label.learning.number.of.votes" >
+				<fmt:param>
+					<span id="averageRating${responseUid}">
+						<fmt:formatNumber value="${userData.averageRating}" type="number" maxFractionDigits="1" />
+					</span>
+				</fmt:param>
+				<fmt:param>
+					<span id="numberOfVotes${responseUid}">${userData.numberOfVotes}</span>
+				</fmt:param>
+			</fmt:message>
+		</div>
+	</div>
+	
+	<div style="clear: both;"></div>
+</c:if>
\ No newline at end of file
Fisheye: Tag 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5 refers to a dead (removed) revision in file `lams_tool_laqa/web/learning/parts/ratingStars.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5 refers to a dead (removed) revision in file `lams_tool_laqa/web/learning/parts/ratingStarsDisabled.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_laqa/web/learning/ratingStarsDisabled.jsp
===================================================================
diff -u
--- lams_tool_laqa/web/learning/ratingStarsDisabled.jsp	(revision 0)
+++ lams_tool_laqa/web/learning/ratingStarsDisabled.jsp	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -0,0 +1,22 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<c:if test="${(generalLearnerFlowDTO.allowRateAnswers == 'true') || content.allowRateAnswers}">
+	<div class="rating-stars-div">
+		<div class="rating-stars-disabled" data-average="${userData.averageRating}" data-id="${responseUid}"></div>
+		<div class="rating-stars-caption">
+		
+			<fmt:message key="label.learning.number.of.votes" >
+				<fmt:param>
+					<span id="averageRating${responseUid}">
+						<fmt:formatNumber value="${userData.averageRating}" type="number" maxFractionDigits="1" />
+					</span>
+				</fmt:param>
+				<fmt:param>
+					<span id="numberOfVotes${responseUid}">${userData.numberOfVotes}</span>
+				</fmt:param>
+			</fmt:message>
+		</div>
+	</div>
+	
+	<div style="clear: both;"></div>
+</c:if>
\ No newline at end of file
Index: lams_tool_laqa/web/learning/submissionDeadline.jsp
===================================================================
diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_laqa/web/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision be07c35c372d904a65581d98660e73f3b13b69db)
+++ lams_tool_laqa/web/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="sessionMap" value="${sessionScope[generalLearnerFlowDTO.httpSessionID]}" />
@@ -19,17 +18,15 @@
 	</title>
 
 	<script language="JavaScript" type="text/JavaScript">
-		function submitLearningMethod(actionMethod) 
-		{
+		function submitLearningMethod(actionMethod) {
 			if (actionMethod == 'endLearning') {
 				document.getElementById("finishButton").disabled = true;
 			}
 			document.QaLearningForm.method.value=actionMethod; 
 			document.QaLearningForm.submit();
 		}
 		
-		function submitMethod(actionMethod) 
-		{
+		function submitMethod(actionMethod) {
 			submitLearningMethod(actionMethod);
 		}
 	</script>
@@ -90,11 +87,3 @@
 	<div id="footer"></div>
 </body>
 </lams:html>
-
-
-
-
-
-
-
-
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteContentDAO.java
===================================================================
diff -u -r5b17b810b5302c90b2daf6a5866bf4f6e85bef6a -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteContentDAO.java	(.../IVoteContentDAO.java)	(revision 5b17b810b5302c90b2daf6a5866bf4f6e85bef6a)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteContentDAO.java	(.../IVoteContentDAO.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -43,8 +43,6 @@
 
     void saveOrUpdateVote(VoteContent voteContent);
 
-    void removeVote(VoteContent voteContent);
-
     void removeVoteById(Long voteContentId);
 
     void removeVoteSessions(VoteContent voteContent);
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteQueContentDAO.java
===================================================================
diff -u -r5b17b810b5302c90b2daf6a5866bf4f6e85bef6a -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteQueContentDAO.java	(.../IVoteQueContentDAO.java)	(revision 5b17b810b5302c90b2daf6a5866bf4f6e85bef6a)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteQueContentDAO.java	(.../IVoteQueContentDAO.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -37,8 +37,6 @@
 
     VoteQueContent getQuestionByDisplayOrder(final Long displayOrder, final Long voteContentUid);
 
-    void saveQuestion(VoteQueContent voteQueContent);
-
     void saveOrUpdateQuestion(VoteQueContent voteQueContent);
 
     void removeQuestion(VoteQueContent voteQueContent);
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteSessionDAO.java
===================================================================
diff -u -r5b17b810b5302c90b2daf6a5866bf4f6e85bef6a -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteSessionDAO.java	(.../IVoteSessionDAO.java)	(revision 5b17b810b5302c90b2daf6a5866bf4f6e85bef6a)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteSessionDAO.java	(.../IVoteSessionDAO.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -29,11 +29,12 @@
 import org.lamsfoundation.lams.tool.vote.pojos.VoteSession;
 
 /**
+ * <p>
+ * Interface that defines the contract for VoteSession access
+ * </p>
+ * 
  * @author Ozgur Demirtas
  * 
- *         <p>
- *         Interface that defines the contract for VoteSession access
- *         </p>
  */
 public interface IVoteSessionDAO {
     VoteSession getVoteSessionByUID(Long uid);
@@ -60,6 +61,4 @@
 
     List<Long> getSessionsFromContent(VoteContent voteContent);
 
-    List getSessionNamesFromContent(VoteContent voteContent);
-
 }
\ No newline at end of file
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUserDAO.java
===================================================================
diff -u -r5b17b810b5302c90b2daf6a5866bf4f6e85bef6a -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUserDAO.java	(.../IVoteUserDAO.java)	(revision 5b17b810b5302c90b2daf6a5866bf4f6e85bef6a)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUserDAO.java	(.../IVoteUserDAO.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -28,36 +28,30 @@
 import org.lamsfoundation.lams.tool.vote.pojos.VoteSession;
 
 /**
+ * <p>
+ * Interface that defines the contract for VoteQueUsr access
+ * </p>
+ * 
  * @author Ozgur Demirtas
  * 
- *         <p>
- *         Interface that defines the contract for VoteQueUsr access
- *         </p>
  */
 public interface IVoteUserDAO {
-    public VoteQueUsr getVoteUserByUID(Long uid);
 
-    public VoteQueUsr getUserByUserId(Long userId);
+    VoteQueUsr getUserByUserId(Long userId);
 
-    public VoteQueUsr getVoteUserBySession(final Long queUsrId, final Long voteSessionId);
+    VoteQueUsr getVoteUserBySession(final Long queUsrId, final Long voteSessionId);
 
-    public int getCompletedVoteUserBySessionUid(final Long voteSessionUid);
+    int getCompletedVoteUserBySessionUid(final Long voteSessionUid);
 
-    public List getVoteUserBySessionUid(final Long voteSessionUid);
+    VoteQueUsr getVoteQueUsrById(long voteQueUsrId);
 
-    public VoteQueUsr getVoteQueUsrById(long voteQueUsrId);
+    void saveVoteUser(VoteQueUsr voteUser);
 
-    public void saveVoteUser(VoteQueUsr voteUser);
+    void updateVoteUser(VoteQueUsr voteUser);
 
-    public void updateVoteUser(VoteQueUsr voteUser);
+    List<VoteQueUsr> getUserBySessionOnly(final VoteSession voteSession);
 
-    public List<VoteQueUsr> getUserBySessionOnly(final VoteSession voteSession);
+    void removeVoteUser(VoteQueUsr voteUser);
 
-    public void removeVoteUserById(Long userId);
-
-    public void removeVoteUser(VoteQueUsr voteUser);
-
-    public int getNumberOfUsers(VoteSession voteSession);
-
-    public int getTotalNumberOfUsers();
+    int getTotalNumberOfUsers();
 }
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUsrAttemptDAO.java
===================================================================
diff -u -r5b17b810b5302c90b2daf6a5866bf4f6e85bef6a -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUsrAttemptDAO.java	(.../IVoteUsrAttemptDAO.java)	(revision 5b17b810b5302c90b2daf6a5866bf4f6e85bef6a)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUsrAttemptDAO.java	(.../IVoteUsrAttemptDAO.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -54,8 +54,6 @@
 
     List<VoteUsrAttempt> getStandardAttemptsByQuestionUid(final Long questionUid);
 
-    int getAttemptsForQuestionContent(final Long voteQueContentId);
-
     int getStandardAttemptsForQuestionContentAndSessionUid(final Long voteQueContentId, final Long voteSessionUid);
 
     List<VoteUsrAttempt> getAttemptsForQuestionContentAndSessionUid(final Long voteQueContentId,
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteContentDAO.java
===================================================================
diff -u -r5b17b810b5302c90b2daf6a5866bf4f6e85bef6a -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteContentDAO.java	(.../VoteContentDAO.java)	(revision 5b17b810b5302c90b2daf6a5866bf4f6e85bef6a)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteContentDAO.java	(.../VoteContentDAO.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -108,10 +108,6 @@
 	}
     }
 
-    public void removeVote(VoteContent voteContent) {
-	this.getHibernateTemplate().delete(voteContent);
-    }
-
     public void removeVoteSessions(VoteContent voteContent) {
 	this.getHibernateTemplate().deleteAll(voteContent.getVoteSessions());
     }
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteQueContentDAO.java
===================================================================
diff -u -r5b17b810b5302c90b2daf6a5866bf4f6e85bef6a -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteQueContentDAO.java	(.../VoteQueContentDAO.java)	(revision 5b17b810b5302c90b2daf6a5866bf4f6e85bef6a)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteQueContentDAO.java	(.../VoteQueContentDAO.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -83,11 +83,6 @@
     }
 
     @Override
-    public void saveQuestion(VoteQueContent voteQueContent) {
-	this.getHibernateTemplate().save(voteQueContent);
-    }
-
-    @Override
     public void saveOrUpdateQuestion(VoteQueContent voteQueContent) {
 	this.getHibernateTemplate().saveOrUpdate(voteQueContent);
     }
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteSessionDAO.java
===================================================================
diff -u -r5b17b810b5302c90b2daf6a5866bf4f6e85bef6a -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteSessionDAO.java	(.../VoteSessionDAO.java)	(revision 5b17b810b5302c90b2daf6a5866bf4f6e85bef6a)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteSessionDAO.java	(.../VoteSessionDAO.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -54,8 +54,6 @@
 
     private static final String COUNT_SESSION_COMPLETE = "from voteSession in class VoteSession where voteSession.sessionStatus='COMPLETE'";
 
-    private static final String GET_SESSIONNAMES_FROM_CONTENT = "select votes.session_name from VoteSession votes where votes.voteContent=:voteContent order by votes.voteSessionId";
-
     public VoteSession getVoteSessionByUID(Long sessionUid) {
 	return (VoteSession) this.getHibernateTemplate().get(VoteSession.class, sessionUid);
     }
@@ -143,8 +141,4 @@
     public List<Long> getSessionsFromContent(VoteContent voteContent) {
 	return (getHibernateTemplate().findByNamedParam(GET_SESSIONS_FROM_CONTENT, "voteContent", voteContent));
     }
-
-    public List getSessionNamesFromContent(VoteContent voteContent) {
-	return (getHibernateTemplate().findByNamedParam(GET_SESSIONNAMES_FROM_CONTENT, "voteContent", voteContent));
-    }
 }
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUserDAO.java
===================================================================
diff -u -r5b17b810b5302c90b2daf6a5866bf4f6e85bef6a -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUserDAO.java	(.../VoteUserDAO.java)	(revision 5b17b810b5302c90b2daf6a5866bf4f6e85bef6a)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUserDAO.java	(.../VoteUserDAO.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -33,32 +33,16 @@
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
 /**
+ * <p>
+ * Hibernate implementation for database access to Voting users (learners) for the voting tool.
+ * </p>
+ * 
  * @author Ozgur Demirtas
- *         <p>
- *         Hibernate implementation for database access to Voting users (learners) for the voting tool.
- *         </p>
  */
 public class VoteUserDAO extends HibernateDaoSupport implements IVoteUserDAO {
 
-    private static final String FIND_VOTE_USR_CONTENT = "from " + VoteQueUsr.class.getName()
-	    + " as voteu where que_usr_id=?";
-
-    private static final String COUNT_USERS_IN_SESSION = "select voteu.queUsrId from VoteQueUsr voteu where voteu.voteSession= :voteSession";
-
     private static final String LOAD_USER_FOR_SESSION = "from voteQueUsr in class VoteQueUsr where  voteQueUsr.voteSessionId= :voteSessionId";
 
-    public VoteQueUsr getVoteUserByUID(Long uid) {
-	String query = "from VoteQueUsr user where user.uid=?";
-
-	List list = getSession().createQuery(query).setLong(0, uid.longValue()).list();
-
-	if (list != null && list.size() > 0) {
-	    VoteQueUsr voteu = (VoteQueUsr) list.get(0);
-	    return voteu;
-	}
-	return null;
-    }
-
     public VoteQueUsr getUserByUserId(Long userId) {
 	String query = "from VoteQueUsr user where user.queUsrId=?";
 
@@ -71,12 +55,6 @@
 	return null;
     }
 
-    public List getVoteUserBySessionUid(final Long voteSessionUid) {
-	List list = getSession().createQuery(LOAD_USER_FOR_SESSION)
-		.setLong("voteSessionId", voteSessionUid.longValue()).list();
-	return list;
-    }
-
     public int getCompletedVoteUserBySessionUid(final Long voteSessionUid) {
 	List list = getSession().createQuery(LOAD_USER_FOR_SESSION)
 		.setLong("voteSessionId", voteSessionUid.longValue()).list();
@@ -128,21 +106,6 @@
 	this.getHibernateTemplate().update(voteUser);
     }
 
-    public void removeVoteUserById(Long userId) {
-	HibernateTemplate templ = this.getHibernateTemplate();
-	if (userId != null) {
-	    List list = getSession().createQuery(FIND_VOTE_USR_CONTENT).setLong(0, userId.longValue()).list();
-
-	    if (list != null && list.size() > 0) {
-		VoteQueUsr voteu = (VoteQueUsr) list.get(0);
-		this.getSession().setFlushMode(FlushMode.AUTO);
-		templ.delete(voteu);
-		templ.flush();
-	    }
-	}
-
-    }
-
     public List<VoteQueUsr> getUserBySessionOnly(final VoteSession voteSession) {
 	List<VoteQueUsr> list = getSession().createQuery(LOAD_USER_FOR_SESSION)
 		.setLong("voteSessionId", voteSession.getUid().longValue()).list();
@@ -154,10 +117,6 @@
 	this.getHibernateTemplate().delete(voteUser);
     }
 
-    public int getNumberOfUsers(VoteSession voteSession) {
-	return (getHibernateTemplate().findByNamedParam(COUNT_USERS_IN_SESSION, "voteSession", voteSession)).size();
-    }
-
     public int getTotalNumberOfUsers() {
 	String query = "from obj in class VoteQueUsr";
 	return this.getHibernateTemplate().find(query).size();
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java
===================================================================
diff -u -r5b17b810b5302c90b2daf6a5866bf4f6e85bef6a -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java	(.../VoteUsrAttemptDAO.java)	(revision 5b17b810b5302c90b2daf6a5866bf4f6e85bef6a)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java	(.../VoteUsrAttemptDAO.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -153,18 +153,6 @@
     }
 
     @Override
-    public int getAttemptsForQuestionContent(final Long questionUid) {
-	List list = getSession().createQuery(VoteUsrAttemptDAO.LOAD_ATTEMPT_FOR_QUESTION_CONTENT)
-		.setLong("voteQueContentId", questionUid.longValue()).list();
-
-	if ((list != null) && (list.size() > 0)) {
-	    return list.size();
-	}
-
-	return 0;
-    }
-
-    @Override
     public int getStandardAttemptsForQuestionContentAndSessionUid(final Long questionUid, final Long sessionUid) {
 	List list = getAttemptsForQuestionContentAndSessionUid(questionUid, sessionUid);
 	return list.size();
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dto/VoteGeneralLearnerFlowDTO.java
===================================================================
diff -u -r9afb93ea36dcedb5db374cacb84b3c4a3d30465c -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dto/VoteGeneralLearnerFlowDTO.java	(.../VoteGeneralLearnerFlowDTO.java)	(revision 9afb93ea36dcedb5db374cacb84b3c4a3d30465c)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dto/VoteGeneralLearnerFlowDTO.java	(.../VoteGeneralLearnerFlowDTO.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -80,8 +80,6 @@
 
     protected String notebookEntry;
 
-    protected String totalQuestionCount;
-
     protected String previewOnly;
 
     protected String reportViewOnly;
@@ -383,21 +381,6 @@
     }
 
     /**
-     * @return Returns the totalQuestionCount.
-     */
-    public String getTotalQuestionCount() {
-	return totalQuestionCount;
-    }
-
-    /**
-     * @param totalQuestionCount
-     *            The totalQuestionCount to set.
-     */
-    public void setTotalQuestionCount(String totalQuestionCount) {
-	this.totalQuestionCount = totalQuestionCount;
-    }
-
-    /**
      * @return Returns the listUserEntries.
      */
     public List getListUserEntries() {
@@ -429,8 +412,7 @@
 		.append("learningMode: ", learningMode).append("maxNominationCount: ", maxNominationCount)
 		.append("allowTextEntry: ", allowTextEntry).append("showResults: ", showResults)
 		.append("lockOnFinish: ", lockOnFinish).append("toolContentID: ", toolContentID)
-		.append("toolContentUID: ", toolContentUID).append("totalQuestionCount: ", totalQuestionCount)
-		.append("requestLearningReport: ", requestLearningReport)
+		.append("toolContentUID: ", toolContentUID).append("requestLearningReport: ", requestLearningReport)
 		.append("requestLearningReportProgress: ", requestLearningReportProgress)
 		.append("nominationsSubmited: ", nominationsSubmited)
 		.append("mapGeneralCheckedOptionsContent: ", mapGeneralCheckedOptionsContent)
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java
===================================================================
diff -u -r5b17b810b5302c90b2daf6a5866bf4f6e85bef6a -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java	(.../IVoteService.java)	(revision 5b17b810b5302c90b2daf6a5866bf4f6e85bef6a)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java	(.../IVoteService.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -22,8 +22,10 @@
 
 package org.lamsfoundation.lams.tool.vote.service;
 
+import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
@@ -105,28 +107,16 @@
 
     VoteUsrAttempt getAttemptByUID(Long uid);
 
-    void createVoteQue(VoteQueContent voteQueContent);
-
-    void createVoteSession(VoteSession voteSession);
-
     void createVoteQueUsr(VoteQueUsr voteQueUsr);
 
     VoteQueUsr getVoteUserBySession(final Long queUsrId, final Long sessionUid);
 
     VoteQueUsr getUserByUserId(Long userId);
 
-    List getVoteUserBySessionUid(final Long voteSessionUid);
-
-    int getCompletedVoteUserBySessionUid(final Long voteSessionUid);
-
     VoteQueContent getQuestionByDisplayOrder(final Long displayOrder, final Long voteContentUid);
 
     Set<String> getAttemptsForUserAndSessionUseOpenAnswer(final Long userUid, final Long sessionUid);
 
-    Set getSessionUserEntriesSet(final Long voteSessionUid);
-
-    void createVoteUsrAttempt(VoteUsrAttempt voteUsrAttempt);
-
     void updateVoteUsrAttempt(VoteUsrAttempt voteUsrAttempt);
 
     List<VoteQueUsr> getUserBySessionOnly(final VoteSession voteSession);
@@ -135,37 +125,45 @@
 
     void showOpenVote(VoteUsrAttempt voteUsrAttempt);
 
-    int getAttemptsForQuestionContent(final Long questionUid);
-
     boolean studentActivityOccurredStandardAndOpen(VoteContent voteContent);
 
     int getUserEnteredVotesCountForContent(final Long voteContentUid);
 
     List<VoteUsrAttempt> getAttemptsForQuestionContentAndSessionUid(final Long questionUid, final Long voteSessionUid);
 
-    int getStandardAttemptsForQuestionContentAndSessionUid(final Long questionUid, final Long voteSessionId);
-
-    int getSessionEntriesCount(final Long voteSessionId);
-
     List<VoteUsrAttempt> getAttemptsForUserAndQuestionContent(final Long userUid, final Long questionUid);
+    
+    /**
+     * creates a new vote record in the database
+     */
+    void createAttempt(VoteQueUsr voteQueUsr, Map mapGeneralCheckedOptionsContent, String userEntry,
+	    VoteSession voteSession, Long voteContentUid);
 
-    VoteUsrAttempt getAttemptForUserAndQuestionContentAndSession(final Long queUsrId, final Long questionUid,
-	    final Long toolSessionUid);
-
     VoteQueContent getQuestionByUid(Long uid);
 
     void removeVoteQueContent(VoteQueContent voteQueContent);
 
     VoteQueContent getVoteQueContentByUID(Long uid);
 
     void saveOrUpdateVoteQueContent(VoteQueContent voteQueContent);
-
-    List<VoteUsrAttempt> getStandardAttemptsByQuestionUid(final Long questionUid);
     
-    VoteQueContent getDefaultVoteContentFirstQuestion();
+    VoteContent createQuestions(List<VoteQuestionDTO> questionDTOs, VoteContent voteContent);
 
-    VoteQueUsr getVoteUserByUID(Long uid);
+    /**
+     * Build a map of the display ids -> nomination text. If checkedOptions != null then only include the display ids in
+     * the checkedOptions list.
+     * 
+     * @param request
+     * @param voteContent
+     *                the content of the vote from the database
+     * @param checkedOptions
+     *                collection of String display IDs to which to restrict the map (optional)
+     * @return Map of display id -> nomination text.
+     */
+    Map<String, String> buildQuestionMap(VoteContent voteContent, Collection<String> checkedOptions);
 
+    List<VoteUsrAttempt> getStandardAttemptsByQuestionUid(final Long questionUid);
+
     void updateVoteUser(VoteQueUsr voteUser);
 
     void removeAttemptsForUserandSession(final Long queUsrId, final Long sessionUid);
@@ -176,34 +174,8 @@
 
     void updateVote(VoteContent vote);
 
-    void updateVoteSession(VoteSession voteSession);
-
     VoteSession getVoteSessionByUID(Long uid);
 
-    /**
-     * Get the count of all the potential learners for the vote session. This will include the people that have never
-     * logged into the lesson. Not great, but it is a better estimate of how many users there will be eventually than
-     * the number of people already known to the tool.
-     * 
-     * @param voteSessionId
-     *            The tool session id
-     */
-    int getVoteSessionPotentialLearnersCount(Long voteSessionId);
-
-    void deleteVote(VoteContent vote);
-
-    void deleteVoteById(Long voteId);
-
-    void deleteVoteSession(VoteSession voteSession);
-
-    List getSessionNamesFromContent(VoteContent voteContent);
-
-    void removeAttempt(VoteUsrAttempt attempt);
-
-    void deleteVoteQueUsr(VoteQueUsr voteQueUsr);
-
-    User getCurrentUserData(String username);
-
     int getTotalNumberOfUsers();
 
     void saveVoteContent(VoteContent vote);
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java
===================================================================
diff -u -r0cf80d736677826d89b04c4d957546975c678f24 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java	(.../VoteServicePOJO.java)	(revision 0cf80d736677826d89b04c4d957546975c678f24)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java	(.../VoteServicePOJO.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -23,6 +23,7 @@
 package org.lamsfoundation.lams.tool.vote.service;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
 import java.util.Hashtable;
 import java.util.Iterator;
@@ -31,12 +32,15 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.SortedMap;
+import java.util.TimeZone;
 import java.util.TreeMap;
 import java.util.TreeSet;
 import java.util.Vector;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
@@ -49,6 +53,7 @@
 import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
 import org.lamsfoundation.lams.notebook.service.ICoreNotebookService;
 import org.lamsfoundation.lams.tool.IToolVO;
+import org.lamsfoundation.lams.tool.SimpleURL;
 import org.lamsfoundation.lams.tool.ToolContentImport102Manager;
 import org.lamsfoundation.lams.tool.ToolContentManager;
 import org.lamsfoundation.lams.tool.ToolOutput;
@@ -88,6 +93,8 @@
 import org.lamsfoundation.lams.util.audit.IAuditService;
 import org.lamsfoundation.lams.util.wddx.WDDXProcessor;
 import org.lamsfoundation.lams.util.wddx.WDDXProcessorConversionException;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.dao.DataAccessException;
 
 /**
@@ -118,7 +125,6 @@
     private IDataFlowDAO dataFlowDAO;
 
     private MessageService messageService;
-    private ILamsCoreToolService lamsCoreToolService;
 
     public VoteServicePOJO() {
     }
@@ -162,7 +168,7 @@
 
 		// set group leader
 		session.setGroupLeader(leader);
-		this.updateVoteSession(session);
+		voteSessionDAO.updateVoteSession(session);
 	    }
 	}
 
@@ -197,7 +203,7 @@
 	    if (userAttempt == null) {
 		VoteUsrAttempt voteUsrAttempt = new VoteUsrAttempt(attempTime, timeZone, question, user, userEntry,
 			true);
-		this.createVoteUsrAttempt(voteUsrAttempt);
+		voteUsrAttemptDAO.saveVoteUsrAttempt(voteUsrAttempt);
 
 		// if it's been changed by the leader
 	    } else if (leaderAttempt.getAttemptTime().compareTo(userAttempt.getAttemptTime()) != 0) {
@@ -214,7 +220,7 @@
 
 	// remove redundant ones
 	for (VoteUsrAttempt redundantUserAttempt : userAttempts) {
-	    this.removeAttempt(redundantUserAttempt);
+	    voteUsrAttemptDAO.removeVoteUsrAttempt(redundantUserAttempt);
 	}
     }
 
@@ -227,8 +233,8 @@
 	int entriesCount = 0;
 	Set<VoteUsrAttempt> userEntries = null;
 	if (toolSessionUid != null) {
-	    entriesCount = this.getSessionEntriesCount(toolSessionUid);
-	    userEntries = this.getSessionUserEntriesSet(toolSessionUid);
+	    entriesCount = voteUsrAttemptDAO.getSessionEntriesCount(toolSessionUid);
+	    userEntries = voteUsrAttemptDAO.getSessionUserEntriesSet(toolSessionUid);
 	}
 
 	Long mapIndex = 1L;
@@ -247,7 +253,7 @@
 	    String noHTMLNomination = VoteUtils.stripHTML(question.getQuestion());
 	    mapStandardNominationsContent.put(mapIndex, noHTMLNomination);
 
-	    int votesCount = this.getStandardAttemptsForQuestionContentAndSessionUid(question.getUid(), toolSessionUid);
+	    int votesCount = voteUsrAttemptDAO.getStandardAttemptsForQuestionContentAndSessionUid(question.getUid(), toolSessionUid);
 	    totalStandardVotesCount += votesCount;
 	    mapStandardUserCount.put(mapIndex, new Long(votesCount));
 
@@ -301,14 +307,14 @@
 	    sessionDTO.setSessionId(session.getVoteSessionId().toString());
 	    sessionDTO.setSessionName(session.getSession_name());
 
-	    int entriesCount = this.getSessionEntriesCount(session.getUid());
+	    int entriesCount = voteUsrAttemptDAO.getSessionEntriesCount(session.getUid());
 
 	    // potentialUserCount
 	    int potentialUserCount = this.getVoteSessionPotentialLearnersCount(session.getUid());
 	    sessionDTO.setSessionUserCount(potentialUserCount);
 
 	    // completedSessionUserCount
-	    int completedSessionUserCount = this.getCompletedVoteUserBySessionUid(session.getUid());
+	    int completedSessionUserCount = voteUserDAO.getCompletedVoteUserBySessionUid(session.getUid());
 	    sessionDTO.setCompletedSessionUserCount(completedSessionUserCount);
 
 	    Long mapIndex = 1L;
@@ -323,7 +329,7 @@
 	    for (VoteQueContent question : (Set<VoteQueContent>) voteContent.getVoteQueContents()) {
 		mapStandardNominationsHTMLedContent.put(mapIndex, question.getQuestion());
 
-		int votesCount = this.getStandardAttemptsForQuestionContentAndSessionUid(question.getUid(),
+		int votesCount = voteUsrAttemptDAO.getStandardAttemptsForQuestionContentAndSessionUid(question.getUid(),
 			session.getUid());
 		totalStandardVotesCount += votesCount;
 		mapStandardUserCount.put(mapIndex, new Long(votesCount));
@@ -449,6 +455,26 @@
 	return sessionDTOs;
     }
 
+    /**
+     * Get the count of all the potential learners for the vote session. This will include the people that have never
+     * logged into the lesson. Not great, but it is a better estimate of how many users there will be eventually than
+     * the number of people already known to the tool.
+     * 
+     * @param voteSessionId
+     *            The tool session id
+     */
+    private int getVoteSessionPotentialLearnersCount(Long sessionUid) {
+	VoteSession session = voteSessionDAO.getVoteSessionByUID(sessionUid);
+	if (session != null) {
+	    Set<User> potentialLearners = toolService.getAllPotentialLearners(session.getVoteSessionId().longValue());
+	    return potentialLearners != null ? potentialLearners.size() : 0;
+	} else {
+	    VoteServicePOJO.logger
+		    .error("Unable to find vote session record id=" + sessionUid + ". Returning 0 users.");
+	    return 0;
+	}
+    }
+
     @Override
     public List<VoteMonitoredAnswersDTO> getOpenVotes(Long voteContentUid, Long currentSessionId, Long userId) {
 	Set<String> userEntries = voteUsrAttemptDAO.getUserEntries(voteContentUid);
@@ -591,10 +617,6 @@
 	return voteContentDAO.getVoteContentByContentId(toolContentID);
     }
 
-    public void updateVoteContent(VoteContent voteContent) {
-	voteContentDAO.updateVoteContent(voteContent);
-    }
-
     public VoteQueContent getQuestionByDisplayOrder(final Long displayOrder, final Long voteContentUid) {
 	return voteQueContentDAO.getQuestionByDisplayOrder(displayOrder, voteContentUid);
     }
@@ -604,10 +626,6 @@
 	return voteQueUsr;
     }
 
-    public void createVoteQue(VoteQueContent voteQueContent) {
-	voteQueContentDAO.saveQuestion(voteQueContent);
-    }
-
     public List<VoteUsrAttempt> getAttemptsForQuestionContentAndSessionUid(final Long questionUid,
 	    final Long voteSessionUid) {
 	return voteUsrAttemptDAO.getAttemptsForQuestionContentAndSessionUid(questionUid, voteSessionUid);
@@ -621,10 +639,7 @@
 	return voteUsrAttemptDAO.getAttemptsForUserAndSession(queUsrUid, sessionUid);
     }
 
-    public Set<VoteUsrAttempt> getSessionUserEntriesSet(final Long voteSessionUid) {
-	return voteUsrAttemptDAO.getSessionUserEntriesSet(voteSessionUid);
-    }
-
+    @Override
     public VoteQueContent getVoteQueContentByUID(Long uid) {
 	if (uid == null) {
 	    return null;
@@ -633,153 +648,376 @@
 	return voteQueContentDAO.getQuestionByUid(uid);
     }
 
+    @Override
     public void saveOrUpdateVoteQueContent(VoteQueContent voteQueContent) {
 	voteQueContentDAO.saveOrUpdateQuestion(voteQueContent);
     }
+    
+    @Override
+    public VoteContent createQuestions(List<VoteQuestionDTO> questionDTOs, VoteContent voteContent) {
 
-    public List<VoteQueUsr> getUserBySessionOnly(final VoteSession voteSession) {
-	return voteUserDAO.getUserBySessionOnly(voteSession);
-    }
+	int displayOrder = 0;
+	for (VoteQuestionDTO questionDTO : questionDTOs) {
+	    String currentQuestionText = questionDTO.getQuestion();
 
-    public void createVoteSession(VoteSession voteSession) {
-	voteSessionDAO.saveVoteSession(voteSession);
+	    // skip empty questions
+	    if (currentQuestionText.isEmpty()) {
+		continue;
+	    }
+
+	    ++displayOrder;
+
+	    VoteQueContent question = getVoteQueContentByUID(questionDTO.getUid());
+
+	    // in case question doesn't exist
+	    if (question == null) {
+
+		question = new VoteQueContent(currentQuestionText, displayOrder, voteContent);
+		// adding a new question to content
+		voteContent.getVoteQueContents().add(question);
+		question.setVoteContent(voteContent);
+
+		// in case question exists already
+	    } else {
+
+		question.setQuestion(currentQuestionText);
+		question.setDisplayOrder(displayOrder);
+	    }
+
+	    saveOrUpdateVoteQueContent(question);
+	}
+
+	return voteContent;
     }
+    
+    @Override
+    public Map<String, String> buildQuestionMap(VoteContent voteContent, Collection<String> checkedOptions) {
+	Map<String, String> mapQuestionsContent = new TreeMap<String, String>(new VoteComparator());
+	Set<VoteQueContent> questions = voteContent.getVoteQueContents();
+	
+	// should we add questions from data flow from other activities?
+	if (Boolean.TRUE.equals(voteContent.getAssignedDataFlowObject())
+		&& (voteContent.getMaxExternalInputs() == null || voteContent.getExternalInputsAdded() == null || voteContent
+			.getExternalInputsAdded() < voteContent.getMaxExternalInputs())) {
+	    // If we are using tool input, we need to get it now and
+	    // create questions. Once they are created, they will be not altered, no matter if another learner gets to
+	    // this point and the tool input changed
+	    HttpSession ss = SessionManager.getSession();
+	    UserDTO toolUser = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	    long userId = toolUser.getUserID().longValue();
 
-    public VoteSession getVoteSessionByUID(Long uid) {
-	return voteSessionDAO.getVoteSessionByUID(uid);
+	    // We get whatever the source tool provides us with and try to create questions out of it
+	    ToolOutput toolInput = getToolInput(voteContent.getVoteContentId(), new Long(userId).intValue());
+
+	    Object value = toolInput.getValue().getComplex();
+	    short inputsAdded = voteContent.getExternalInputsAdded() == null ? 0 : voteContent.getExternalInputsAdded();
+	    Short maxInputs = voteContent.getMaxExternalInputs();
+	    Set<VoteQueContent> existingNominations = voteContent.getVoteQueContents();
+	    // The input is an array (users) of arrays of strings (their answers)
+	    if (value instanceof String[][]) {
+		if (value != null) {
+		    String[][] usersAndAnswers = (String[][]) value;
+		    int nominationIndex = voteContent.getVoteQueContents().size() + 1;
+		    for (String[] userAnswers : usersAndAnswers) {
+			if (userAnswers != null) {
+			    if (maxInputs != null && inputsAdded >= maxInputs) {
+				// if we reached the maximum number of inputs, i.e. number of students that will be
+				// taken
+				// into account
+				break;
+			    }
+			    boolean anyAnswersAdded = false;
+			    for (String questionText : userAnswers) {
+				if (!StringUtils.isBlank(questionText)) {
+				    VoteQueContent nomination = new VoteQueContent();
+				    nomination.setDisplayOrder(nominationIndex);
+				    nomination.setMcContent(voteContent);
+				    nomination.setQuestion(questionText);
+				    if (!isNominationExists(nomination, existingNominations)) {
+					saveOrUpdateVoteQueContent(nomination);
+					voteContent.getVoteQueContents().add(nomination);
+					nominationIndex++;
+					anyAnswersAdded = true;
+				    }
+				}
+			    }
+			    if (anyAnswersAdded) {
+				inputsAdded++;
+			    }
+			}
+		    }
+		}
+	    } else if (value instanceof String[]) {
+		// the input is a list of strings (questions, for example)
+		int nominationIndex = voteContent.getVoteQueContents().size() + 1;
+		String[] userAnswers = (String[]) value;
+		for (String questionText : userAnswers) {
+		    if (maxInputs != null && inputsAdded >= maxInputs) {
+			// if we reached the maximum number of inputs, i.e. number of students that will be taken
+			// into account
+			break;
+		    }
+
+		    if (!StringUtils.isBlank(questionText)) {
+			VoteQueContent nomination = new VoteQueContent();
+			nomination.setDisplayOrder(nominationIndex);
+			nomination.setMcContent(voteContent);
+			nomination.setQuestion(questionText);
+			if (!isNominationExists(nomination, existingNominations)) {
+			    saveOrUpdateVoteQueContent(nomination);
+			    voteContent.getVoteQueContents().add(nomination);
+			    nominationIndex++;
+			    inputsAdded++;
+			}
+		    }
+		}
+	    } else if (value instanceof String && !StringUtils.isBlank((String) value)) {
+		int nominationIndex = voteContent.getVoteQueContents().size() + 1;
+		VoteQueContent nomination = new VoteQueContent();
+		nomination.setDisplayOrder(nominationIndex);
+		nomination.setMcContent(voteContent);
+		nomination.setQuestion((String) value);
+		if (!isNominationExists(nomination, existingNominations)) {
+		    saveOrUpdateVoteQueContent(nomination);
+		    voteContent.getVoteQueContents().add(nomination);
+		}
+	    }
+	    if (value instanceof SimpleURL[][]) {
+		if (value != null) {
+		    SimpleURL[][] usersAndUrls = (SimpleURL[][]) value;
+		    int nominationIndex = voteContent.getVoteQueContents().size() + 1;
+		    for (SimpleURL[] userUrls : usersAndUrls) {
+			if (userUrls != null) {
+			    if (maxInputs != null && inputsAdded >= maxInputs) {
+				// if we reached the maximum number of inputs, i.e. number of students that will be
+				// taken
+				// into account
+				break;
+			    }
+			    boolean anyAnswersAdded = false;
+			    for (SimpleURL url : userUrls) {
+				if (url != null) {
+				    VoteQueContent nomination = new VoteQueContent();
+				    nomination.setDisplayOrder(nominationIndex);
+				    nomination.setMcContent(voteContent);
+
+				    String link = "<a href=\"" + url.getUrl() + "\">" + url.getNameToDisplay() + "</a>";
+				    nomination.setQuestion(link);
+				    if (!isNominationExists(nomination, existingNominations)) {
+					saveOrUpdateVoteQueContent(nomination);
+					voteContent.getVoteQueContents().add(nomination);
+					nominationIndex++;
+					anyAnswersAdded = true;
+				    }
+				}
+			    }
+			    if (anyAnswersAdded) {
+				inputsAdded++;
+			    }
+			}
+		    }
+		}
+	    }
+
+	    else if (value instanceof SimpleURL[]) {
+		// the input is a list of strings (questions, for example)
+		int nominationIndex = voteContent.getVoteQueContents().size() + 1;
+		SimpleURL[] userUrls = (SimpleURL[]) value;
+		for (SimpleURL url : userUrls) {
+		    if (maxInputs != null && inputsAdded >= maxInputs) {
+			// if we reached the maximum number of inputs, i.e. number of students that will be taken
+			// into account
+			break;
+		    }
+		    if (url != null) {
+			VoteQueContent nomination = new VoteQueContent();
+			nomination.setDisplayOrder(nominationIndex);
+			nomination.setMcContent(voteContent);
+
+			String link = "<a href=\"" + url.getUrl() + "\">" + url.getNameToDisplay() + "</a>";
+			nomination.setQuestion(link);
+			if (!isNominationExists(nomination, existingNominations)) {
+			    saveOrUpdateVoteQueContent(nomination);
+			    voteContent.getVoteQueContents().add(nomination);
+			    nominationIndex++;
+			    inputsAdded++;
+			}
+		    }
+		}
+	    } else if (value instanceof SimpleURL) {
+		int nominationIndex = voteContent.getVoteQueContents().size() + 1;
+		VoteQueContent nomination = new VoteQueContent();
+		nomination.setDisplayOrder(nominationIndex);
+
+		SimpleURL url = (SimpleURL) value;
+		String link = "<a href=\"" + url.getUrl() + "\">" + url.getNameToDisplay() + "</a>";
+		nomination.setQuestion(link);
+		if (!isNominationExists(nomination, existingNominations)) {
+		    nomination.setMcContent(voteContent);
+		    saveOrUpdateVoteQueContent(nomination);
+		    voteContent.getVoteQueContents().add(nomination);
+		}
+	    }
+
+	    voteContent.setExternalInputsAdded(inputsAdded);
+	    saveVoteContent(voteContent);
+	    questions = voteContent.getVoteQueContents();
+	}
+
+	for (VoteQueContent question : questions) {
+	    String displayOrder = "" + question.getDisplayOrder();
+	    if ((checkedOptions == null || checkedOptions.contains(displayOrder)) && !displayOrder.equals("0")) {
+		/* add the question to the questions Map in the displayOrder */
+		mapQuestionsContent.put(displayOrder.toString(), question.getQuestion());
+	    }
+	}
+
+	return mapQuestionsContent;
     }
 
-    public int getVoteSessionPotentialLearnersCount(Long sessionUid) {
-	VoteSession session = voteSessionDAO.getVoteSessionByUID(sessionUid);
-	if (session != null) {
-	    Set<User> potentialLearners = toolService.getAllPotentialLearners(session.getVoteSessionId().longValue());
-	    return potentialLearners != null ? potentialLearners.size() : 0;
-	} else {
-	    VoteServicePOJO.logger
-		    .error("Unable to find vote session record id=" + sessionUid + ". Returning 0 users.");
-	    return 0;
+    private static boolean isNominationExists(VoteQueContent nomination, Set<VoteQueContent> existingNominations) {
+	if (existingNominations != null && nomination != null) {
+	    for (VoteQueContent existingNomination : existingNominations) {
+		if (existingNomination.getQuestion() != null
+			&& existingNomination.getQuestion().equals(nomination.getQuestion())) {
+		    return true;
+		}
+	    }
 	}
+	return false;
     }
 
+    @Override
+    public List<VoteQueUsr> getUserBySessionOnly(final VoteSession voteSession) {
+	return voteUserDAO.getUserBySessionOnly(voteSession);
+    }
+
+    @Override
+    public VoteSession getVoteSessionByUID(Long uid) {
+	return voteSessionDAO.getVoteSessionByUID(uid);
+    }
+
+    @Override
     public void createVoteQueUsr(VoteQueUsr voteQueUsr) {
 	voteUserDAO.saveVoteUser(voteQueUsr);
     }
 
+    @Override
     public VoteQueUsr getVoteUserBySession(final Long queUsrId, final Long sessionUid) {
 	return voteUserDAO.getVoteUserBySession(queUsrId, sessionUid);
     }
 
-    public VoteQueUsr getVoteUserByUID(Long uid) {
-	return voteUserDAO.getVoteUserByUID(uid);
-    }
-
+    @Override
     public void updateVoteUser(VoteQueUsr voteUser) {
 	voteUserDAO.updateVoteUser(voteUser);
     }
 
+    @Override
     public VoteQueUsr getUserByUserId(Long userID) {
 	VoteQueUsr voteQueUsr = voteUserDAO.getUserByUserId(userID);
 	return voteQueUsr;
     }
 
-    public void createVoteUsrAttempt(VoteUsrAttempt voteUsrAttempt) {
-	voteUsrAttemptDAO.saveVoteUsrAttempt(voteUsrAttempt);
-    }
-
+    @Override
     public List<VoteUsrAttempt> getStandardAttemptsByQuestionUid(final Long voteQueContentId) {
 	return voteUsrAttemptDAO.getStandardAttemptsByQuestionUid(voteQueContentId);
     }
 
-    public int getSessionEntriesCount(final Long voteSessionUid) {
-	return voteUsrAttemptDAO.getSessionEntriesCount(voteSessionUid);
-    }
-
+    @Override
     public VoteUsrAttempt getAttemptByUID(Long uid) {
 	return voteUsrAttemptDAO.getAttemptByUID(uid);
     }
 
-    public int getAttemptsForQuestionContent(final Long voteQueContentId) {
-	return voteUsrAttemptDAO.getAttemptsForQuestionContent(voteQueContentId);
-    }
-
-    public int getStandardAttemptsForQuestionContentAndSessionUid(final Long voteQueContentId, final Long voteSessionUid) {
-	return voteUsrAttemptDAO.getStandardAttemptsForQuestionContentAndSessionUid(voteQueContentId, voteSessionUid);
-    }
-
-    public VoteUsrAttempt getAttemptForUserAndQuestionContentAndSession(final Long queUsrId,
-	    final Long voteQueContentId, final Long toolSessionUid) {
-	return voteUsrAttemptDAO.getAttemptForUserAndQuestionContentAndSession(queUsrId, voteQueContentId,
-		toolSessionUid);
-    }
-
+    @Override
     public void updateVoteUsrAttempt(VoteUsrAttempt voteUsrAttempt) {
 	voteUsrAttemptDAO.updateVoteUsrAttempt(voteUsrAttempt);
     }
 
+    @Override
     public void removeAttemptsForUserandSession(final Long queUsrId, final Long sessionUid) {
 	voteUsrAttemptDAO.removeAttemptsForUserandSession(queUsrId, sessionUid);
     }
 
+    @Override
     public List<VoteUsrAttempt> getAttemptsForUser(final Long userUid) {
 	return voteUsrAttemptDAO.getAttemptsForUser(userUid);
     }
+    
+    @Override
+    public void createAttempt(VoteQueUsr voteQueUsr, Map mapGeneralCheckedOptionsContent, String userEntry,
+	    VoteSession voteSession, Long voteContentUid) {
 
+	Date attempTime = new Date(System.currentTimeMillis());
+	String timeZone = TimeZone.getDefault().getDisplayName();
+
+	//in case of free entry
+	if (mapGeneralCheckedOptionsContent.size() == 0) {
+	    VoteQueContent defaultContentFirstQuestion = voteQueContentDAO.getDefaultVoteContentFirstQuestion();
+	    createAttempt(defaultContentFirstQuestion, voteQueUsr, attempTime, timeZone, userEntry, voteSession);
+	    
+	//if the question is selected
+	} else if (voteContentUid != null) {
+	    Iterator itCheckedMap = mapGeneralCheckedOptionsContent.entrySet().iterator();
+	    while (itCheckedMap.hasNext()) {
+		Map.Entry checkedPairs = (Map.Entry) itCheckedMap.next();
+		Long questionDisplayOrder = new Long(checkedPairs.getKey().toString());
+
+		VoteQueContent question = getQuestionByDisplayOrder(questionDisplayOrder, voteContentUid);
+		createAttempt(question, voteQueUsr, attempTime, timeZone, userEntry, voteSession);
+	    }
+	}
+
+    }
+    
+    private void createAttempt(VoteQueContent question, VoteQueUsr user, Date attempTime, String timeZone,
+	    String userEntry, VoteSession session) {
+
+	if (question != null) {
+	    VoteUsrAttempt existingAttempt = voteUsrAttemptDAO.getAttemptForUserAndQuestionContentAndSession(
+		    user.getQueUsrId(), question.getVoteContentId(), session.getUid());
+
+	    if (existingAttempt != null) {
+		existingAttempt.setUserEntry(userEntry);
+		existingAttempt.setAttemptTime(attempTime);
+		existingAttempt.setTimeZone(timeZone);
+		updateVoteUsrAttempt(existingAttempt);
+	    } else {
+		VoteUsrAttempt voteUsrAttempt = new VoteUsrAttempt(attempTime, timeZone, question, user, userEntry,
+			true);
+		voteUsrAttemptDAO.saveVoteUsrAttempt(voteUsrAttempt);
+	    }
+	}
+    }
+
+    @Override
     public int getUserEnteredVotesCountForContent(final Long voteContentUid) {
 	return voteUsrAttemptDAO.getUserEnteredVotesCountForContent(voteContentUid);
     }
 
+    @Override
     public VoteQueContent getQuestionByUid(Long uid) {
 	return voteQueContentDAO.getQuestionByUid(uid);
     }
 
+    @Override
     public void removeVoteQueContent(VoteQueContent voteQueContent) {
 	voteQueContentDAO.removeQuestion(voteQueContent);
     }
 
+    @Override
     public VoteSession getSessionBySessionId(Long voteSessionId) {
 	return voteSessionDAO.getSessionBySessionId(voteSessionId);
     }
 
-    public int getCompletedVoteUserBySessionUid(final Long voteSessionUid) {
-	return voteUserDAO.getCompletedVoteUserBySessionUid(voteSessionUid);
-    }
-
-    public List getVoteUserBySessionUid(final Long voteSessionUid) {
-	return voteUserDAO.getVoteUserBySessionUid(voteSessionUid);
-    }
-
-    public List getSessionNamesFromContent(VoteContent voteContent) {
-	return voteSessionDAO.getSessionNamesFromContent(voteContent);
-    }
-
+    @Override
     public void updateVote(VoteContent vote) {
 	voteContentDAO.updateVoteContent(vote);
     }
 
-    public void updateVoteSession(VoteSession voteSession) {
-	voteSessionDAO.updateVoteSession(voteSession);
-    }
-
-    public void deleteVote(VoteContent vote) {
-	voteContentDAO.removeVote(vote);
-    }
-
-    public void deleteVoteById(Long voteId) {
-	voteContentDAO.removeVoteById(voteId);
-    }
-
     public int countSessionComplete() {
 	return voteSessionDAO.countSessionComplete();
     }
 
-    public void deleteVoteSession(VoteSession voteSession) {
-	voteSessionDAO.removeVoteSession(voteSession);
-    }
-
-    public void removeAttempt(VoteUsrAttempt attempt) {
-	voteUsrAttemptDAO.removeVoteUsrAttempt(attempt);
-    }
-
     /**
      * logs hiding of a user entered vote
      */
@@ -796,39 +1034,21 @@
 		.getVoteQueUsr().getUsername(), voteUsrAttempt.getUserEntry());
     }
 
-    public void deleteVoteQueUsr(VoteQueUsr voteQueUsr) {
-	try {
-	    voteUserDAO.removeVoteUser(voteQueUsr);
-	} catch (DataAccessException e) {
-	    throw new VoteApplicationException("Exception occured when lams is removing" + " the user: "
-		    + e.getMessage(), e);
-	}
-    }
-
+    @Override
     public void saveVoteContent(VoteContent vote) {
 	voteContentDAO.saveVoteContent(vote);
     }
 
+    @Override
     public List<Long> getSessionsFromContent(VoteContent voteContent) {
 	return voteSessionDAO.getSessionsFromContent(voteContent);
     }
 
+    @Override
     public int getTotalNumberOfUsers() {
 	return voteUserDAO.getTotalNumberOfUsers();
     }
 
-    public User getCurrentUserData(String username) {
-	/**
-	 * this will return null if the username not found
-	 */
-	User user = userManagementService.getUserByLogin(username);
-	if (user == null) {
-	    VoteServicePOJO.logger.error("No user with the username: " + username + " exists.");
-	    throw new VoteApplicationException("No user with that username exists.");
-	}
-	return user;
-    }
-
     @Override
     public List<VoteUsrAttempt> getAttemptsForUserAndQuestionContent(final Long userUid, final Long questionUid) {
 	try {
@@ -984,7 +1204,7 @@
 		    Iterator sessionUsersAttemptsIterator = voteQueUsr.getVoteUsrAttempts().iterator();
 		    while (sessionUsersAttemptsIterator.hasNext()) {
 			VoteUsrAttempt voteUsrAttempt = (VoteUsrAttempt) sessionUsersAttemptsIterator.next();
-			removeAttempt(voteUsrAttempt);
+			voteUsrAttemptDAO.removeVoteUsrAttempt(voteUsrAttempt);
 		    }
 		}
 	    }
@@ -1201,12 +1421,6 @@
 	contentId = toolService.getToolDefaultContentIdBySignature(toolSignature);
 	return contentId;
     }
-
-    @Override
-    public VoteQueContent getDefaultVoteContentFirstQuestion() {
-	VoteQueContent voteQueContent = voteQueContentDAO.getDefaultVoteContentFirstQuestion();
-	return voteQueContent;
-    }
     
     @Override
     public List getToolSessionsForContent(VoteContent vote) {
@@ -1615,10 +1829,6 @@
 	this.messageService = messageService;
     }
 
-    public void setLamsCoreToolService(ILamsCoreToolService lamsCoreToolService) {
-	this.lamsCoreToolService = lamsCoreToolService;
-    }
-
     public void removeQuestionsFromCache(VoteContent voteContent) {
 	voteContentDAO.removeQuestionsFromCache(voteContent);
     }
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml
===================================================================
diff -u -r40eb54374e84591563d8b6a679ac719dbc85c8f7 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml	(.../voteApplicationContext.xml)	(revision 40eb54374e84591563d8b6a679ac719dbc85c8f7)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml	(.../voteApplicationContext.xml)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -73,13 +73,13 @@
 			   		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>								   		
 			   		<property name="voteOutputFactory"><ref bean="voteOutputFactory"/></property>
 			   		<property name="messageService"><ref bean="lavoteMessageService"/></property>
-			   		<property name="lamsCoreToolService"><ref bean="lamsCoreToolService"/></property>
 			   		<property name="userManagementService"><ref bean="userManagementService"/></property>
 				</bean>
 			</property>
 			<property name="transactionAttributes">
 				<props>
 					<prop key="create*">PROPAGATION_REQUIRED,-VoteApplicationException</prop>
+					<prop key="buildQuestionMap">PROPAGATION_REQUIRED,-VoteApplicationException</prop>
 					<prop key="copy*">PROPAGATION_REQUIRED,-VoteApplicationException</prop>
 					<prop key="save*">PROPAGATION_REQUIRED, -VoteApplicationException</prop>
 					<prop key="update*">PROPAGATION_REQUIRED,-VoteApplicationException</prop>
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java
===================================================================
diff -u -r5b17b810b5302c90b2daf6a5866bf4f6e85bef6a -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java	(.../AuthoringUtil.java)	(revision 5b17b810b5302c90b2daf6a5866bf4f6e85bef6a)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java	(.../AuthoringUtil.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -303,41 +303,6 @@
 	return voteContent;
     }
 
-    protected static VoteContent createQuestions(List<VoteQuestionDTO> questionDTOs, IVoteService voteService,
-	    VoteContent voteContent) {
 
-	int displayOrder = 0;
-	for (VoteQuestionDTO questionDTO : questionDTOs) {
-	    String currentQuestionText = questionDTO.getQuestion();
 
-	    // skip empty questions
-	    if (currentQuestionText.isEmpty()) {
-		continue;
-	    }
-
-	    ++displayOrder;
-
-	    VoteQueContent question = voteService.getVoteQueContentByUID(questionDTO.getUid());
-
-	    // in case question doesn't exist
-	    if (question == null) {
-
-		question = new VoteQueContent(currentQuestionText, displayOrder, voteContent);
-		// adding a new question to content
-		voteContent.getVoteQueContents().add(question);
-		question.setVoteContent(voteContent);
-
-		// in case question exists already
-	    } else {
-
-		question.setQuestion(currentQuestionText);
-		question.setDisplayOrder(displayOrder);
-	    }
-
-	    voteService.saveOrUpdateVoteQueContent(question);
-	}
-
-	return voteContent;
-    }
-
 }
Fisheye: Tag 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5 refers to a dead (removed) revision in file `lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/LearningUtil.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java
===================================================================
diff -u -r5b17b810b5302c90b2daf6a5866bf4f6e85bef6a -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java	(.../VoteAction.java)	(revision 5b17b810b5302c90b2daf6a5866bf4f6e85bef6a)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java	(.../VoteAction.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -757,7 +757,7 @@
 		    voteContentTest, strToolContentID);
 
 	    //store questions
-	    voteContent = AuthoringUtil.createQuestions(questionDTOs, voteService, voteContent);
+	    voteContent = voteService.createQuestions(questionDTOs, voteContent);
 
 	    //store DataFlowObjectAssigment
 	    voteService.saveDataFlowObjectAssigment(assignedDataFlowObject);
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java
===================================================================
diff -u -r5b17b810b5302c90b2daf6a5866bf4f6e85bef6a -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java	(.../VoteLearningAction.java)	(revision 5b17b810b5302c90b2daf6a5866bf4f6e85bef6a)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java	(.../VoteLearningAction.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -417,29 +417,26 @@
 	voteService.removeAttemptsForUserandSession(user.getUid(), session.getUid());
 
 	/* to minimize changes to working code, convert the String[] array to the mapGeneralCheckedOptionsContent structure */
-	Map<String, String> mapGeneralCheckedOptionsContent = LearningUtil.buildQuestionMap(request, voteService, voteContent,
+	Map<String, String> mapGeneralCheckedOptionsContent = voteService.buildQuestionMap(voteContent,
 		voteDisplayOrderIds);
 
 	if (mapGeneralCheckedOptionsContent.size() > 0) {
-	    LearningUtil.createAttempt(voteService, user, mapGeneralCheckedOptionsContent, "", session,
-		    voteContentUid);
+	    voteService.createAttempt(user, mapGeneralCheckedOptionsContent, "", session, voteContentUid);
 	}
 
 	if ((mapGeneralCheckedOptionsContent.size() == 0 && (userEntryAvailable == true))) {
 	    Map mapLeanerCheckedOptionsContent = new TreeMap(new VoteComparator());
 
 	    if (userEntry.length() > 0) {
-		LearningUtil.createAttempt(voteService, user, mapLeanerCheckedOptionsContent, userEntry,
-			session, voteContentUid);
+		voteService.createAttempt(user, mapLeanerCheckedOptionsContent, userEntry, session, voteContentUid);
 	    }
 	}
 
 	if ((mapGeneralCheckedOptionsContent.size() > 0) && (userEntryAvailable == true)) {
 	    Map mapLeanerCheckedOptionsContent = new TreeMap(new VoteComparator());
 
 	    if (userEntry.length() > 0) {
-		LearningUtil.createAttempt(voteService, user, mapLeanerCheckedOptionsContent, userEntry,
-			session, voteContentUid);
+		voteService.createAttempt(user, mapLeanerCheckedOptionsContent, userEntry, session, voteContentUid);
 	    }
 	}
 
@@ -495,7 +492,7 @@
 	voteGeneralLearnerFlowDTO.setNominationsSubmited(new Boolean(false).toString());
 	voteGeneralLearnerFlowDTO.setMaxNominationCountReached(new Boolean(false).toString());
 
-	Map<String, String> mapQuestionsContent = LearningUtil.buildQuestionMap(request, voteService, voteContent, null);
+	Map<String, String> mapQuestionsContent = voteService.buildQuestionMap(voteContent, null);
 	request.setAttribute(MAP_QUESTION_CONTENT_LEARNER, mapQuestionsContent);
 
 	Map mapGeneralCheckedOptionsContent = new TreeMap(new VoteComparator());
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java
===================================================================
diff -u -r5b17b810b5302c90b2daf6a5866bf4f6e85bef6a -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java	(.../VoteLearningStarterAction.java)	(revision 5b17b810b5302c90b2daf6a5866bf4f6e85bef6a)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java	(.../VoteLearningStarterAction.java)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -170,13 +170,10 @@
 	    voteGeneralLearnerFlowDTO.setNotebookEntry(notebookEntry.getEntry());
 	}
 
-	request.setAttribute(VoteAppConstants.VOTE_GENERAL_LEARNER_FLOW_DTO, voteGeneralLearnerFlowDTO);
+	Map<String, String> mapQuestions = voteService.buildQuestionMap(voteContent, null);
+	request.setAttribute(VoteAppConstants.MAP_QUESTION_CONTENT_LEARNER, mapQuestions);
 
-	/* handle PREVIEW mode */
-	if (mode != null && mode.equals("author")) {
-	    commonContentSetup(request, voteService, voteContent, voteGeneralLearnerFlowDTO);
-	    request.setAttribute(VoteAppConstants.VOTE_GENERAL_LEARNER_FLOW_DTO, voteGeneralLearnerFlowDTO);
-	}
+	request.setAttribute(VoteAppConstants.VOTE_GENERAL_LEARNER_FLOW_DTO, voteGeneralLearnerFlowDTO);
 	
 	VoteQueUsr user = null;
 	if ((mode != null) && mode.equals(ToolAccessMode.TEACHER.toString())) {
@@ -270,12 +267,6 @@
 	}
 
 	/*
-	 * fetch question content from content
-	 */
-	Map<String, String> mapQuestions = LearningUtil.buildQuestionMap(request, voteService, voteContent, null);
-	request.setAttribute(VoteAppConstants.MAP_QUESTION_CONTENT_LEARNER, mapQuestions);
-
-	/*
 	 * the user's session id AND user id exists in the tool tables goto this screen if the OverAll Results scren has
 	 * been already called up by this user
 	 */
@@ -364,21 +355,6 @@
     }
 
     /**
-     * sets up question and candidate answers maps commonContentSetup(HttpServletRequest request, VoteContent
-     * voteContent)
-     * 
-     * @param request
-     * @param voteContent
-     */
-    protected void commonContentSetup(HttpServletRequest request, IVoteService voteService, VoteContent voteContent,
-	    VoteGeneralLearnerFlowDTO voteGeneralLearnerFlowDTO) {
-	Map<String, String> mapQuestionsContent = LearningUtil.buildQuestionMap(request, voteService, voteContent, null);
-
-	request.setAttribute(VoteAppConstants.MAP_QUESTION_CONTENT_LEARNER, mapQuestionsContent);
-	voteGeneralLearnerFlowDTO.setTotalQuestionCount(new Long(mapQuestionsContent.size()).toString());
-    }
-
-    /**
      * sets up session scope attributes based on content linked to the passed tool session id
      * setupAttributes(HttpServletRequest request, VoteContent voteContent)
      * 
Index: lams_tool_vote/web/authoring/pedagogicalPlannerForm.jsp
===================================================================
diff -u -r35a0e719d061c08b52e705135bb2f2126079ed21 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_vote/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 35a0e719d061c08b52e705135bb2f2126079ed21)
+++ lams_tool_vote/web/authoring/pedagogicalPlannerForm.jsp	(.../pedagogicalPlannerForm.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -78,13 +78,12 @@
 		
 		<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 		<h4 class="space-left"><fmt:message key="label.authoring.instructions"/></h4>
-		<lams:CKEditor id="instructions"
-			value="${formBean.instructions}"
+		<lams:CKEditor id="instructions" value="${formBean.instructions}"
 			contentFolderID="${formBean.contentFolderID}"
-               toolbarSet="CustomPedplanner" height="150px"
-               width="${param.plannerCKEditorLongWidth}" displayExpanded="false">
+			toolbarSet="CustomPedplanner" height="150px"
+			width="${param.plannerCKEditorLongWidth}" displayExpanded="false">
 		</lams:CKEditor>
-		
+
 		<c:if test="${formBean.nominationCount ne 0}">
 			<h4 class="space-left space-top"><fmt:message key="label.vote.nominations"/></h4>
 			<table id="nominationTable" cellpadding="0" cellspacing="0">
Index: lams_tool_vote/web/learning/AllNominations.jsp
===================================================================
diff -u -ra93d2b61cf24814e3afc91d5cc6887bf7a5bf05c -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_vote/web/learning/AllNominations.jsp	(.../AllNominations.jsp)	(revision a93d2b61cf24814e3afc91d5cc6887bf7a5bf05c)
+++ lams_tool_vote/web/learning/AllNominations.jsp	(.../AllNominations.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -1,27 +1,5 @@
-<%-- 
-Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
-License Information: http://lamsfoundation.org/licensing/lams/2.0/
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2 as 
-  published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-  USA
-
-  http://www.gnu.org/licenses/gpl.txt
---%>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
-
 <%@ include file="/common/taglibs.jsp"%>
 
 <c:set scope="request" var="lams">
@@ -159,14 +137,12 @@
 								</c:if>
 							</c:forEach>
 
-							<c:forEach var="currentRate"
-								items="${voteGeneralLearnerFlowDTO.mapStandardRatesContent}">
-								<c:set var="currentRateKey" scope="request"
-									value="${currentRate.key}" />
+							<c:forEach var="currentRate" items="${voteGeneralLearnerFlowDTO.mapStandardRatesContent}">
+								<c:set var="currentRateKey" scope="request" value="${currentRate.key}" />
 								<c:if test="${currentNominationKey == currentRateKey}"> 				
-																	 &nbsp(<fmt:formatNumber type="number" maxFractionDigits="2" value="${currentRate.value}" />
+									&nbsp(<fmt:formatNumber type="number" maxFractionDigits="2" value="${currentRate.value}" />
 									<fmt:message key="label.percent" />) 
-														</c:if>
+								</c:if>
 							</c:forEach>
 						</td>
 					</tr>
@@ -189,8 +165,8 @@
 				
 				<c:if test="${VoteLearningForm.allowTextEntry}">
 					<strong> <fmt:message key="label.open.votes"/> </strong>
-					<c:forEach var="vote"
-						items="${requestScope.listUserEntriesContent}">
+					
+					<c:forEach var="vote" items="${requestScope.listUserEntriesContent}">
 						<c:if test="${vote.userEntry != null}">
 							<div>
 								<c:out value="${vote.userEntry}" escapeXml="true" /> 
@@ -201,20 +177,17 @@
 				</c:if>
 
 				<c:choose>
-				 <c:when test="${fn:length(requestScope.listGeneralCheckedOptionsContent) > 1}">
-                                      <strong><fmt:message key="label.learner.nominations" />  </strong>
-				 </c:when>
-                                 <c:otherwise>
-
-				     <strong><fmt:message key="label.learner.nomination" />  </strong>
-				 </c:otherwise>
+					<c:when test="${fn:length(requestScope.listGeneralCheckedOptionsContent) > 1}">
+                    	<strong><fmt:message key="label.learner.nominations" />  </strong>
+					</c:when>
+                	<c:otherwise>
+						<strong><fmt:message key="label.learner.nomination" />  </strong>
+					</c:otherwise>
 				</c:choose>
 
-
 			</div>
 
-			<c:forEach var="entry"
-				items="${requestScope.listGeneralCheckedOptionsContent}">
+			<c:forEach var="entry" items="${requestScope.listGeneralCheckedOptionsContent}">
 				<div>
 					<c:out value="${entry}" escapeXml="false" />
 				</div>
@@ -224,7 +197,6 @@
 				<c:out value="${VoteLearningForm.userEntry}" escapeXml="true"/>
 			</div>
 
-
 			<c:if test="${voteGeneralLearnerFlowDTO.notebookEntry != null && voteGeneralLearnerFlowDTO.notebookEntry != ''}">
 	
 				<h2>
@@ -237,7 +209,6 @@
 			</c:if>							
 
 			<div id="chartDiv0" style="height: 220px; display: none;"></div>
-			
 
 			<div class="space-bottom-top">
 				<c:if test="${voteGeneralLearnerFlowDTO.reportViewOnly != 'true' }">
Index: lams_tool_vote/web/learning/AnswersContent.jsp
===================================================================
diff -u -r43437f9c52f60b4fe545162b3ed72e6ddf911777 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_vote/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 43437f9c52f60b4fe545162b3ed72e6ddf911777)
+++ lams_tool_vote/web/learning/AnswersContent.jsp	(.../AnswersContent.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -1,27 +1,5 @@
-<%-- 
-Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
-License Information: http://lamsfoundation.org/licensing/lams/2.0/
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2 as 
-  published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-  USA
-
-  http://www.gnu.org/licenses/gpl.txt
---%>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
-
 <%@ include file="/common/taglibs.jsp"%>
 
 <c:set scope="request" var="lams">
@@ -222,9 +200,9 @@
 				<html:hidden property="donePreview" />
 
 				<div class="space-bottom-top">
-						<html:submit property="continueOptionsCombined" styleClass="button">
-							<fmt:message key="label.submit.vote" />
-						</html:submit>
+					<html:submit property="continueOptionsCombined" styleClass="button">
+						<fmt:message key="label.submit.vote" />
+					</html:submit>
 				</div>
 				
 		</html:form>
Index: lams_tool_vote/web/learning/ExitLearning.jsp
===================================================================
diff -u -r43437f9c52f60b4fe545162b3ed72e6ddf911777 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_vote/web/learning/ExitLearning.jsp	(.../ExitLearning.jsp)	(revision 43437f9c52f60b4fe545162b3ed72e6ddf911777)
+++ lams_tool_vote/web/learning/ExitLearning.jsp	(.../ExitLearning.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -1,27 +1,5 @@
-<%-- 
-Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
-License Information: http://lamsfoundation.org/licensing/lams/2.0/
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2 as 
-  published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-  USA
-
-  http://www.gnu.org/licenses/gpl.txt
---%>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
-
 <%@ include file="/common/taglibs.jsp"%>
 
 <c:set scope="request" var="lams">
@@ -38,8 +16,7 @@
 	
 	<title><fmt:message key="activity.title" /></title>
 	
-	<script type="text/javascript"
-		src="${lams}includes/javascript/common.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/raphael.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/g.raphael.js"></script>
@@ -65,8 +42,7 @@
 	<div id="content">
 
 		<h1>
-			<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}"
-				escapeXml="true" />
+			<c:out value="${voteGeneralLearnerFlowDTO.activityTitle}" escapeXml="true" />
 		</h1>
 		
 		<c:if test="${VoteLearningForm.lockOnFinish and voteGeneralLearnerFlowDTO.learningMode != 'teacher'}">
@@ -113,40 +89,39 @@
 				<jsp:include page="/learning/RevisitedNoDisplay.jsp" />
 			</c:if>
 			
-				<c:if test="${voteGeneralLearnerFlowDTO.reflection}">
-					<h2>
-							<lams:out value="${voteGeneralLearnerFlowDTO.reflectionSubject}" escapeHtml="true" />												
-					</h2>
+			<c:if test="${voteGeneralLearnerFlowDTO.reflection}">
+				<h2>
+					<lams:out value="${voteGeneralLearnerFlowDTO.reflectionSubject}" escapeHtml="true" />												
+				</h2>
 	
-					<lams:out value="${voteGeneralLearnerFlowDTO.notebookEntry}"
-						escapeHtml="true" />
-				</c:if>
+				<lams:out value="${voteGeneralLearnerFlowDTO.notebookEntry}" escapeHtml="true" />
+			</c:if>
 
-				<c:if test="${voteGeneralLearnerFlowDTO.learningMode != 'teacher'}">
+			<c:if test="${voteGeneralLearnerFlowDTO.learningMode != 'teacher'}">
 				<br>
-					<c:if test="${voteGeneralLearnerFlowDTO.reflection && hasEditRight}">
-						<html:button property="forwardtoReflection" styleClass="button"
-							onclick="submitMethod('forwardtoReflection');"> 
-							<fmt:message key="label.edit" />
-						</html:button>
-					</c:if>
+				<c:if test="${voteGeneralLearnerFlowDTO.reflection && hasEditRight}">
+					<html:button property="forwardtoReflection" styleClass="button"
+						onclick="submitMethod('forwardtoReflection');"> 
+						<fmt:message key="label.edit" />
+					</html:button>
+				</c:if>
 
-					<div class="space-bottom-top align-right">
-						<html:link href="#nogo" property="learnerFinished" styleClass="button" styleId="finishButton"
-							onclick="submitMethod('learnerFinished');return false">
-							<span class="nextActivity">
-								<c:choose>
-									<c:when test="${activityPosition.last}">
-										<fmt:message key="button.submitActivity" />
-									</c:when>
-									<c:otherwise>
-										<fmt:message key="button.endLearning" />
-									</c:otherwise>
-								</c:choose>
+				<div class="space-bottom-top align-right">
+					<html:link href="#nogo" property="learnerFinished" styleClass="button" styleId="finishButton"
+						onclick="submitMethod('learnerFinished');return false">
+						<span class="nextActivity">
+							<c:choose>
+								<c:when test="${activityPosition.last}">
+									<fmt:message key="button.submitActivity" />
+								</c:when>
+								<c:otherwise>
+									<fmt:message key="button.endLearning" />
+								</c:otherwise>
+							</c:choose>
 						</span>
-						</html:link>
-					</div>
-				</c:if>
+					</html:link>
+				</div>
+			</c:if>
 
 		</html:form>
 
Index: lams_tool_vote/web/learning/IndividualLearnerResults.jsp
===================================================================
diff -u -r43437f9c52f60b4fe545162b3ed72e6ddf911777 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_vote/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 43437f9c52f60b4fe545162b3ed72e6ddf911777)
+++ lams_tool_vote/web/learning/IndividualLearnerResults.jsp	(.../IndividualLearnerResults.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -1,24 +1,3 @@
-<%-- 
-Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
-License Information: http://lamsfoundation.org/licensing/lams/2.0/
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2 as 
-  published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-  USA
-
-  http://www.gnu.org/licenses/gpl.txt
---%>
-
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
@@ -54,9 +33,9 @@
 		</h1>
 		
 		<c:if test="${VoteLearningForm.lockOnFinish and voteGeneralLearnerFlowDTO.learningMode != 'teacher'}">
-				<div class="info space-bottom">
-					<fmt:message key="message.warnLockOnFinish" />
-				</div>
+			<div class="info space-bottom">
+				<fmt:message key="message.warnLockOnFinish" />
+			</div>
 		</c:if>	
 			
 		<html:form action="/learning?validate=false" enctype="multipart/form-data" method="POST" target="_self">
@@ -89,18 +68,14 @@
 			</c:if>
 			
 			<p>
-				<strong> <fmt:message key="label.learning.reportMessage" />
-				</strong>
+				<strong> <fmt:message key="label.learning.reportMessage" /></strong>
 			</p>
 
 			<ul>
-				<c:forEach var="entry"
-					items="${requestScope.mapGeneralCheckedOptionsContent}">
+				<c:forEach var="entry" items="${requestScope.mapGeneralCheckedOptionsContent}">
 					<li>
 						<c:out value="${entry.value}" escapeXml="false" />
 					</li>
-
-
 				</c:forEach>
 
 				<c:if test="${not empty VoteLearningForm.userEntry}">
@@ -112,17 +87,14 @@
 
 			<div class="space-bottom-top">
 				<c:if test="${hasEditRight}">
-					<html:submit property="redoQuestions" styleClass="button"
-						onclick="submitMethod('redoQuestions');">
+					<html:submit property="redoQuestions" styleClass="button" onclick="submitMethod('redoQuestions');">
 						<fmt:message key="label.retake" />
 					</html:submit>
 				</c:if>
 
 				<c:choose>
-
 				<c:when test="${VoteLearningForm.showResults=='true'}">
-					<html:submit property="viewAllResults" styleClass="button"
-						onclick="submitMethod('viewAllResults');">
+					<html:submit property="viewAllResults" styleClass="button" onclick="submitMethod('viewAllResults');">
 						<fmt:message key="label.overAllResults" />
 					</html:submit>
 				</c:when>
@@ -158,7 +130,6 @@
 			</div>
 		</html:form>
 
-
 	</div>
 	<div id="footer"></div>
 </body>
Index: lams_tool_vote/web/learning/Notebook.jsp
===================================================================
diff -u -r43437f9c52f60b4fe545162b3ed72e6ddf911777 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_vote/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 43437f9c52f60b4fe545162b3ed72e6ddf911777)
+++ lams_tool_vote/web/learning/Notebook.jsp	(.../Notebook.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -1,27 +1,5 @@
-<%-- 
-Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
-License Information: http://lamsfoundation.org/licensing/lams/2.0/
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2 as 
-  published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-  USA
-
-  http://www.gnu.org/licenses/gpl.txt
---%>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
-
 <%@ include file="/common/taglibs.jsp"%>
 
 <c:set var="lams">
@@ -35,12 +13,10 @@
 <lams:head>
 	<html:base />
 	<lams:css />
-	<title><fmt:message key="activity.title" />
-	</title>
+	<title><fmt:message key="activity.title" /></title>
 
 	<script language="JavaScript" type="text/JavaScript">
-		function submitMethod(actionMethod) 
-		{
+		function submitMethod(actionMethod) {
 			document.VoteLearningForm.dispatch.value=actionMethod; 
 			document.VoteLearningForm.submit();
 		}
Index: lams_tool_vote/web/learning/RevisitedAllNominations.jsp
===================================================================
diff -u -r43437f9c52f60b4fe545162b3ed72e6ddf911777 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_vote/web/learning/RevisitedAllNominations.jsp	(.../RevisitedAllNominations.jsp)	(revision 43437f9c52f60b4fe545162b3ed72e6ddf911777)
+++ lams_tool_vote/web/learning/RevisitedAllNominations.jsp	(.../RevisitedAllNominations.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -1,27 +1,5 @@
-<%-- 
-Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
-License Information: http://lamsfoundation.org/licensing/lams/2.0/
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"  "http://www.w3.org/TR/html4/strict.dtd">
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2 as 
-  published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-  USA
-
-  http://www.gnu.org/licenses/gpl.txt
---%>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
-
 <%@ include file="/common/taglibs.jsp"%>
 
 <c:set scope="request" var="lams">
@@ -38,8 +16,7 @@
 	
 	<title><fmt:message key="activity.title" /></title>
 	
-	<script type="text/javascript"
-		src="${lams}includes/javascript/common.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/raphael.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/raphael/g.raphael.js"></script>
@@ -50,8 +27,7 @@
 	<script type="text/javascript">
 		var chartDataUrl = '<lams:WebAppURL />chartGenerator.do';
 		
-		function submitMethod(actionMethod) 
-		{
+		function submitMethod(actionMethod) {
 			if (actionMethod == "learnerFinished") {
 				document.getElementById("finishButton").disabled = true;
 			}
@@ -107,26 +83,23 @@
 				<jsp:include page="/learning/RevisitedNoDisplay.jsp" />
 			</c:if>
 
-				<h4>
-						<lams:out value="${voteGeneralLearnerFlowDTO.reflectionSubject}" escapeHtml="true" />												
-				</h4>
+			<h4>
+				<lams:out value="${voteGeneralLearnerFlowDTO.reflectionSubject}" escapeHtml="true" />												
+			</h4>
 
-				<lams:out value="${voteGeneralLearnerFlowDTO.notebookEntry}"
-					escapeHtml="true" />
+			<lams:out value="${voteGeneralLearnerFlowDTO.notebookEntry}" escapeHtml="true" />
 			
-				<c:if test="${voteGeneralLearnerFlowDTO.lockOnFinish == 'true' && hasEditRight}">					
+			<c:if test="${voteGeneralLearnerFlowDTO.lockOnFinish == 'true' && hasEditRight}">					
 				<br>
-						<html:button property="forwardtoReflection" styleClass="button"
-							onclick="submitMethod('forwardtoReflection');"> 
-							<fmt:message key="label.edit" />
-						</html:button>
-				</c:if>													
+				<html:button property="forwardtoReflection" styleClass="button" onclick="submitMethod('forwardtoReflection');"> 
+					<fmt:message key="label.edit" />
+				</html:button>
+			</c:if>													
 
 			<div class="space-bottom-top">
 
 				<c:if test="${hasEditRight}">
-					<html:submit property="redoQuestionsOk" styleClass="button"
-						onclick="submitMethod('redoQuestionsOk');">
+					<html:submit property="redoQuestionsOk" styleClass="button" onclick="submitMethod('redoQuestionsOk');">
 						<fmt:message key="label.retake" />
 					</html:submit>
 				</c:if>
Index: lams_tool_vote/web/learning/RevisitedDisplay.jsp
===================================================================
diff -u -r15fd4ba6a8bf6e8a7e1b552b49bd9c45e2eb1f6d -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_vote/web/learning/RevisitedDisplay.jsp	(.../RevisitedDisplay.jsp)	(revision 15fd4ba6a8bf6e8a7e1b552b49bd9c45e2eb1f6d)
+++ lams_tool_vote/web/learning/RevisitedDisplay.jsp	(.../RevisitedDisplay.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -1,152 +1,118 @@
-<%-- 
-Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
-License Information: http://lamsfoundation.org/licensing/lams/2.0/
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2 as 
-  published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-  USA
-
-  http://www.gnu.org/licenses/gpl.txt
---%>
-
 <%@ include file="/common/taglibs.jsp"%>
 
-			<h2>
-				<fmt:message key="label.progressiveResults" />
-			</h2>
+<h2>
+	<fmt:message key="label.progressiveResults" />
+</h2>
 
-			<!--present  a mini summary table here -->
+<!--present  a mini summary table here -->
+<table cellspacing="0" class="alternative-color">
+	<tr>
+		<th>
+			<fmt:message key="label.nomination" />
+		</th>
+		<th>
+			<fmt:message key="label.total.votes" />
+		</th>
+	</tr>
 
-			<table cellspacing="0" class="alternative-color">
-				<tr>
-					<th>
-						<fmt:message key="label.nomination" />
-					</th>
-					<th>
-						<fmt:message key="label.total.votes" />
-					</th>
-				</tr>
+	<c:forEach var="currentNomination" items="${voteGeneralLearnerFlowDTO.mapStandardNominationsHTMLedContent}">
+		<c:set var="currentNominationKey" scope="request" value="${currentNomination.key}" />
+		<tr>
+			<td class="space">
+				<c:out value="${currentNomination.value}" escapeXml="false" />
+			</td>
 
-				<c:forEach var="currentNomination"
-					items="${voteGeneralLearnerFlowDTO.mapStandardNominationsHTMLedContent}">
-					<c:set var="currentNominationKey" scope="request"
-						value="${currentNomination.key}" />
-					<tr>
-						<td class="space">
-							<c:out value="${currentNomination.value}" escapeXml="false" />
-						</td>
+			<td>
 
-						<td>
+				<c:forEach var="currentUserCount" items="${voteGeneralLearnerFlowDTO.mapStandardUserCount}">
+					<c:set var="currentUserKey" scope="request" value="${currentUserCount.key}" />
+					<c:if test="${currentNominationKey == currentUserKey}">
 
-							<c:forEach var="currentUserCount"
-								items="${voteGeneralLearnerFlowDTO.mapStandardUserCount}">
-								<c:set var="currentUserKey" scope="request"
-									value="${currentUserCount.key}" />
-								<c:if test="${currentNominationKey == currentUserKey}">
+						<c:if test="${currentUserCount.value != '0' }">
+							<c:forEach var="currentQuestionUid" items="${voteGeneralLearnerFlowDTO.mapStandardQuestionUid}">
+								<c:set var="currentQuestionUidKey" scope="request" value="${currentQuestionUid.key}" />
+								<c:if test="${currentQuestionUidKey == currentUserKey}">
 
-									<c:if test="${currentUserCount.value != '0' }">
-										<c:forEach var="currentQuestionUid"
-											items="${voteGeneralLearnerFlowDTO.mapStandardQuestionUid}">
-											<c:set var="currentQuestionUidKey" scope="request"
-												value="${currentQuestionUid.key}" />
-											<c:if test="${currentQuestionUidKey == currentUserKey}">
-
-												<c:forEach var="currentSessionUid"
-													items="${voteGeneralLearnerFlowDTO.mapStandardToolSessionUid}">
-													<c:set var="currentSessionUidKey" scope="request"
-														value="${currentSessionUid.key}" />
-													<c:if
-														test="${currentSessionUidKey == currentQuestionUidKey}">
-
-														<c:if test="${currentNomination.value != 'Open Vote'}">
-															<c:set scope="request" var="viewURL">
-																<lams:WebAppURL />monitoring.do?method=getVoteNomination&questionUid=${currentQuestionUid.value}&sessionUid=${currentSessionUid.value}
+									<c:forEach var="currentSessionUid" items="${voteGeneralLearnerFlowDTO.mapStandardToolSessionUid}">
+										<c:set var="currentSessionUidKey" scope="request" value="${currentSessionUid.key}" />
+										<c:if test="${currentSessionUidKey == currentQuestionUidKey}">
+	
+											<c:if test="${currentNomination.value != 'Open Vote'}">
+												<c:set scope="request" var="viewURL">
+													<lams:WebAppURL />monitoring.do?method=getVoteNomination&questionUid=${currentQuestionUid.value}&sessionUid=${currentSessionUid.value}
 												</c:set>
-
-															<c:out value="${currentUserCount.value}" />
-
-														</c:if>
-														<c:if test="${currentNomination.value == 'Open Vote'}">
-															<c:out value="${currentUserCount.value}" />
-														</c:if>
-													</c:if>
-												</c:forEach>
+		
+												<c:out value="${currentUserCount.value}" />
 											</c:if>
-										</c:forEach>
-									</c:if>
-									<c:if test="${currentUserCount.value == '0' }">
-										<c:out value="${currentUserCount.value}" />
-									</c:if>
+											
+											<c:if test="${currentNomination.value == 'Open Vote'}">
+												<c:out value="${currentUserCount.value}" />
+											</c:if>
+										</c:if>
+									</c:forEach>
 								</c:if>
 							</c:forEach>
+						</c:if>
+									
+						<c:if test="${currentUserCount.value == '0' }">
+							<c:out value="${currentUserCount.value}" />
+						</c:if>
+					</c:if>
+				</c:forEach>
 
-							<c:forEach var="currentRate"
-								items="${voteGeneralLearnerFlowDTO.mapStandardRatesContent}">
-								<c:set var="currentRateKey" scope="request"
-									value="${currentRate.key}" />
-								<c:if test="${currentNominationKey == currentRateKey}"> 				
-																	 &nbsp(<fmt:formatNumber type="number" maxFractionDigits="2" value="${currentRate.value}" />
-									<fmt:message key="label.percent" />) 
-								</c:if>
-							</c:forEach>
-						</td>
-					</tr>
+				<c:forEach var="currentRate" items="${voteGeneralLearnerFlowDTO.mapStandardRatesContent}">
+					<c:set var="currentRateKey" scope="request" value="${currentRate.key}" />
+					<c:if test="${currentNominationKey == currentRateKey}"> 				
+						&nbsp(<fmt:formatNumber type="number" maxFractionDigits="2" value="${currentRate.value}" />
+						<fmt:message key="label.percent" />) 
+					</c:if>
 				</c:forEach>
+			</td>
+		</tr>
+	</c:forEach>
 
-			</table>
+</table>
 
-			<div>
-				<div class="float-right">
-					<img src='<c:out value="${tool}"/>images/piechart.gif' width="30"
-						title="<fmt:message key='label.tip.displayPieChart'/>"
-						style="cursor: pointer;" height="30" border="0"
-						onclick="javascript:drawChart('pie', 0, {'currentSessionId' : '${VoteLearningForm.toolSessionID}'})">
-					<img src='<c:out value="${tool}"/>images/columnchart.gif' width="30"
-						title="<fmt:message key='label.tip.displayBarChart'/>" 
-						style="cursor: pointer;" height="30" border="0"
-						onclick="javascript:drawChart('bar', 0, {'currentSessionId' : '${VoteLearningForm.toolSessionID}'})">
-				</div>
+<div>
+	<div class="float-right">
+		<img src='<c:out value="${tool}"/>images/piechart.gif' width="30"
+			title="<fmt:message key='label.tip.displayPieChart'/>"
+			style="cursor: pointer;" height="30" border="0"
+			onclick="javascript:drawChart('pie', 0, {'currentSessionId' : '${VoteLearningForm.toolSessionID}'})">
+		<img src='<c:out value="${tool}"/>images/columnchart.gif' width="30"
+			title="<fmt:message key='label.tip.displayBarChart'/>" 
+			style="cursor: pointer;" height="30" border="0"
+			onclick="javascript:drawChart('bar', 0, {'currentSessionId' : '${VoteLearningForm.toolSessionID}'})">
+	</div>
 				
-				<c:if test="${VoteLearningForm.allowTextEntry}">
-					<strong> <fmt:message key="label.open.votes"/> </strong>
-					<c:forEach var="vote"
-						items="${requestScope.listUserEntriesContent}">
-						<div>
-							<c:out value="${vote.userEntry}" escapeXml="true" />
-						</div>
-					</c:forEach>
-					<div>&nbsp;</div>
-				</c:if>
+	<c:if test="${VoteLearningForm.allowTextEntry}">
+		<strong> <fmt:message key="label.open.votes"/> </strong>
+		<c:forEach var="vote" items="${requestScope.listUserEntriesContent}">
+			<div>
+				<c:out value="${vote.userEntry}" escapeXml="true" />
+			</div>
+		</c:forEach>
+		<div>&nbsp;</div>
+	</c:if>
 
-				<c:choose>
-				 <c:when test="${fn:length(requestScope.listGeneralCheckedOptionsContent) > 1}">
-                                      <strong><fmt:message key="label.learner.nominations" />  </strong>
-				 </c:when>
-                                 <c:otherwise>
+	<c:choose>
+		<c:when test="${fn:length(requestScope.listGeneralCheckedOptionsContent) > 1}">
+        	<strong><fmt:message key="label.learner.nominations" />  </strong>
+		</c:when>
+	    <c:otherwise>
+			<strong><fmt:message key="label.learner.nomination" />  </strong>
+		</c:otherwise>
+	</c:choose>
 
-				     <strong><fmt:message key="label.learner.nomination" />  </strong>
-				 </c:otherwise>
-				</c:choose>
+	<c:forEach var="entry"items="${requestScope.listGeneralCheckedOptionsContent}">
+		<div>
+			<c:out value="${entry}" escapeXml="true" />
+		</div>
+	</c:forEach>
+	
+	<div>
+		<c:out value="${VoteLearningForm.userEntry}" escapeXml="true"/>
+	</div>
 
-				<c:forEach var="entry"
-					items="${requestScope.listGeneralCheckedOptionsContent}">
-					<div>
-						<c:out value="${entry}" escapeXml="true" />
-					</div>
-				</c:forEach>
-				<div>
-					<c:out value="${VoteLearningForm.userEntry}" escapeXml="true"/>
-				</div>
-
-				<div id="chartDiv0" style="height: 220px; display: none;"></div>
-		</div>
\ No newline at end of file
+	<div id="chartDiv0" style="height: 220px; display: none;"></div>
+</div>
\ No newline at end of file
Index: lams_tool_vote/web/learning/RevisitedNoDisplay.jsp
===================================================================
diff -u -r59df1b856eea1ef47028856854107761a3327f40 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_vote/web/learning/RevisitedNoDisplay.jsp	(.../RevisitedNoDisplay.jsp)	(revision 59df1b856eea1ef47028856854107761a3327f40)
+++ lams_tool_vote/web/learning/RevisitedNoDisplay.jsp	(.../RevisitedNoDisplay.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -1,35 +1,12 @@
-<%-- 
-Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
-License Information: http://lamsfoundation.org/licensing/lams/2.0/
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2 as 
-  published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-  USA
-
-  http://www.gnu.org/licenses/gpl.txt
---%>
-
 <%@ include file="/common/taglibs.jsp"%>
 
 <c:choose>
 	 <c:when test="${fn:length(requestScope.listGeneralCheckedOptionsContent) > 1}">
-	
 	    <h2><fmt:message key="label.learner.nominations" /></h2>
-	
 	 </c:when>
+	 
 	 <c:otherwise>
 	    <h2><fmt:message key="label.learner.nomination" /></h2>
-	
 	 </c:otherwise>
 </c:choose>
 
Index: lams_tool_vote/web/learning/defineLater.jsp
===================================================================
diff -u -r18e5e690d2e1a7c3d918759f7a2827c8205feaac -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_vote/web/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 18e5e690d2e1a7c3d918759f7a2827c8205feaac)
+++ lams_tool_vote/web/learning/defineLater.jsp	(.../defineLater.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -1,27 +1,5 @@
-<%-- 
-Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
-License Information: http://lamsfoundation.org/licensing/lams/2.0/
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2 as 
-  published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-  USA
-
-  http://www.gnu.org/licenses/gpl.txt
---%>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
-
 <%@ include file="/common/taglibs.jsp"%>
 
 <c:set scope="request" var="lams">
Index: lams_tool_vote/web/learning/submissionDeadline.jsp
===================================================================
diff -u -r8b97231e320c0c5b674f07c14da711f232ba9e1c -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_vote/web/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 8b97231e320c0c5b674f07c14da711f232ba9e1c)
+++ lams_tool_vote/web/learning/submissionDeadline.jsp	(.../submissionDeadline.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -1,27 +1,5 @@
-<%-- 
-Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
-License Information: http://lamsfoundation.org/licensing/lams/2.0/
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2 as 
-  published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
-  USA
-
-  http://www.gnu.org/licenses/gpl.txt
---%>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
-
 <%@ include file="/common/taglibs.jsp"%>
 
 <c:set var="lams">
@@ -39,8 +17,7 @@
 	</title>
 
 	<script language="JavaScript" type="text/JavaScript">
-		function submitMethod(actionMethod) 
-		{
+		function submitMethod(actionMethod) {
 			document.VoteLearningForm.dispatch.value=actionMethod; 
 			document.VoteLearningForm.submit();
 		}
@@ -71,7 +48,7 @@
 
 				<c:if test="${voteGeneralLearnerFlowDTO.reflection != 'true'}">
 
-				      <html:link href="#nogo" property="endLearning" styleId="finishButton" 
+					<html:link href="#nogo" property="endLearning" styleId="finishButton" 
 				      onclick="javascript:submitMethod('learnerFinished');return false"
 				      styleClass="button">
 						<span class="nextActivity">
@@ -103,11 +80,3 @@
 
 </body>
 </lams:html>
-
-
-
-
-
-
-
-
Index: lams_tool_vote/web/monitoring/LearnerNotebook.jsp
===================================================================
diff -u -r43437f9c52f60b4fe545162b3ed72e6ddf911777 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_vote/web/monitoring/LearnerNotebook.jsp	(.../LearnerNotebook.jsp)	(revision 43437f9c52f60b4fe545162b3ed72e6ddf911777)
+++ lams_tool_vote/web/monitoring/LearnerNotebook.jsp	(.../LearnerNotebook.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"  "http://www.w3.org/TR/html4/strict.dtd">
 
 <%@ include file="/common/taglibs.jsp"%>
 
@@ -62,9 +61,3 @@
 </body>
 </lams:html>
 
-
-
-
-
-
-
Index: lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp
===================================================================
diff -u -r5b17b810b5302c90b2daf6a5866bf4f6e85bef6a -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 5b17b810b5302c90b2daf6a5866bf4f6e85bef6a)
+++ lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp	(.../MonitoringMaincontent.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -48,8 +48,7 @@
         	document.VoteMonitoringForm.submit();
         }
 
-		function submitMonitoringMethod(actionMethod) 
-		{
+		function submitMonitoringMethod(actionMethod) {
 			document.VoteMonitoringForm.dispatch.value=actionMethod; 
 			document.VoteMonitoringForm.submit();
 		}
@@ -59,27 +58,23 @@
 			document.VoteAuthoringForm.submit();
 		}
 		
-		function submitModifyQuestion(questionIndexValue, actionMethod) 
-		{
+		function submitModifyQuestion(questionIndexValue, actionMethod) {
 			document.VoteMonitoringForm.questionIndex.value=questionIndexValue; 
 			submitMethod(actionMethod);
 		}
 		
-		function submitModifyMonitoringNomination(questionIndexValue, actionMethod) 
-		{
+		function submitModifyMonitoringNomination(questionIndexValue, actionMethod) {
 			document.VoteMonitoringForm.questionIndex.value=questionIndexValue; 
 			submitMethod(actionMethod);
 		}
 		
 		
-		function submitEditResponse(responseId, actionMethod) 
-		{
+		function submitEditResponse(responseId, actionMethod) {
 			document.VoteMonitoringForm.responseId.value=responseId; 
 			submitMethod(actionMethod);
 		}
 		
-		function submitMethod(actionMethod) 
-		{
+		function submitMethod(actionMethod) {
 			submitMonitoringMethod(actionMethod);
 		}
 		
@@ -88,14 +83,12 @@
 			submitMethod(actionMethod);
 		}
 		
-		function submitModifyOption(optionIndexValue, actionMethod) 
-		{
+		function submitModifyOption(optionIndexValue, actionMethod) {
 			document.VoteMonitoringForm.optIndex.value=optionIndexValue; 
 			submitMethod(actionMethod);
 		}
 
-		function submitModifyNomination(optionIndexValue, actionMethod) 
-		{
+		function submitModifyNomination(optionIndexValue, actionMethod) {
 			document.VoteMonitoringForm.optIndex.value=optionIndexValue; 
 			submitMethod(actionMethod);
 		}
Index: lams_tool_vote/web/monitoring/Reflections.jsp
===================================================================
diff -u -r43437f9c52f60b4fe545162b3ed72e6ddf911777 -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_vote/web/monitoring/Reflections.jsp	(.../Reflections.jsp)	(revision 43437f9c52f60b4fe545162b3ed72e6ddf911777)
+++ lams_tool_vote/web/monitoring/Reflections.jsp	(.../Reflections.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -1,41 +1,38 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-				<c:if test="${notebookEntriesExist == 'true' }"> 			
-					<table class="alternative-color">
-						
-								<tr>			
-									<th colspan=2 valign=top class="align-left">
-										<b>  <fmt:message key="label.reflection"/>  </b> 
-									 </th>
-								</tr>	
-						
-						
-							<c:forEach var="currentDto" items="${reflectionsContainerDTO}">
-					  	 		<c:set var="userName" scope="request" value="${currentDto.userName}"/>
-					  	 		<c:set var="userId" scope="request" value="${currentDto.userId}"/>
-					  	 		<c:set var="sessionId" scope="request" value="${currentDto.sessionId}"/>
-					  	 		<c:set var="reflectionUid" scope="request" value="${currentDto.reflectionUid}"/>
-								<tr>			
-									<td valign=top class="align-left">
-										 <c:out value="${userName}" escapeXml="true"/> 
-									 </td>
-	
-									<td valign=top class="align-left">
-										<c:url value="monitoring.do" var="openNotebook">
-											<c:param name="dispatch" value="openNotebook" />
-											<c:param name="uid" value="${reflectionUid}" />
-											<c:param name="userId" value="${userId}" />
-											<c:param name="userName" value="${userName}" />
-											<c:param name="sessionId" value="${sessionId}" />													
-											<c:param name="contentFolderID" value="${VoteMonitoringForm.contentFolderID}" />																								
-										</c:url>
-		
-										<html:link href="javascript:launchPopup('${fn:escapeXml(openNotebook)}')">
-											<fmt:message key="label.view" />
-										</html:link>
-	
-									 </td>
-								</tr>	
-							</c:forEach>		
-						</table>
-				</c:if> 															
+<c:if test="${notebookEntriesExist == 'true' }">
+	<table class="alternative-color">
+
+		<tr>
+			<th colspan=2 valign=top class="align-left">
+				<b> <fmt:message key="label.reflection" /></b>
+			</th>
+		</tr>
+
+		<c:forEach var="currentDto" items="${reflectionsContainerDTO}">
+			<c:set var="userName" scope="request" value="${currentDto.userName}" />
+			<c:set var="userId" scope="request" value="${currentDto.userId}" />
+			<c:set var="sessionId" scope="request"	value="${currentDto.sessionId}" />
+			<c:set var="reflectionUid" scope="request"	value="${currentDto.reflectionUid}" />
+			<tr>
+				<td valign=top class="align-left">
+					<c:out value="${userName}" escapeXml="true" />
+				</td>
+
+				<td valign=top class="align-left">
+					<c:url value="monitoring.do" var="openNotebook">
+						<c:param name="dispatch" value="openNotebook" />
+						<c:param name="uid" value="${reflectionUid}" />
+						<c:param name="userId" value="${userId}" />
+						<c:param name="userName" value="${userName}" />
+						<c:param name="sessionId" value="${sessionId}" />
+						<c:param name="contentFolderID" value="${VoteMonitoringForm.contentFolderID}" />
+					</c:url> 
+					<html:link href="javascript:launchPopup('${fn:escapeXml(openNotebook)}')">
+						<fmt:message key="label.view" />
+					</html:link>
+				</td>
+			</tr>
+		</c:forEach>
+	</table>
+</c:if>
Index: lams_tool_vote/web/monitoring/SummaryContent.jsp
===================================================================
diff -u -ra93d2b61cf24814e3afc91d5cc6887bf7a5bf05c -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_vote/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision a93d2b61cf24814e3afc91d5cc6887bf7a5bf05c)
+++ lams_tool_vote/web/monitoring/SummaryContent.jsp	(.../SummaryContent.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -39,6 +39,7 @@
 <h1>
 	<c:out value="${voteGeneralMonitoringDTO.activityTitle}" escapeXml="true"/>
 </h1>
+
 <div class="instructions small-space-top">
 	<c:out value="${voteGeneralMonitoringDTO.activityInstructions}" escapeXml="false"/>
 </div>
Index: lams_tool_vote/web/monitoring/VoteNominationViewer.jsp
===================================================================
diff -u -r1221ef505c31384495e181ad07f2d7992c5d18be -r4d139bddc3cdd41d32d9f3033f2100c711d8c0c5
--- lams_tool_vote/web/monitoring/VoteNominationViewer.jsp	(.../VoteNominationViewer.jsp)	(revision 1221ef505c31384495e181ad07f2d7992c5d18be)
+++ lams_tool_vote/web/monitoring/VoteNominationViewer.jsp	(.../VoteNominationViewer.jsp)	(revision 4d139bddc3cdd41d32d9f3033f2100c711d8c0c5)
@@ -3,33 +3,34 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 
-	<lams:html>
+<lams:html>
 	<lams:head>
-	<title> <fmt:message key="label.learnersVoted"/> </title>
+		<title> <fmt:message key="label.learnersVoted"/> </title>
 
-	<%@ include file="/common/header.jsp"%>
+		<%@ include file="/common/header.jsp"%>
 	
-</lams:head>
+	</lams:head>
 <body class="stripes">
-<div id="content">
 
-    <table class="alternative-color">
-	    <tr> <th NOWRAP colspan=2 align=center>  <fmt:message key="label.learnersVoted"/> </th> </tr>
+	<div id="content">
 	
-		<tr> 
-	       <td NOWRAP align=center valign=top><b> <fmt:message key="label.user"/> </b></td>
-		   <td NOWRAP align=center valign=top><b> <fmt:message key="label.attemptTime"/> </b></td>
-	   </tr>
-	    
-		<c:forEach var="userData" items="${voteGeneralMonitoringDTO.mapStudentsVoted}">
-			<tr>		 
-					 <td NOWRAP valign=top align=center>    <c:out value="${userData.userName}"/>   </td>  
-					 <td NOWRAP valign=top align=center>    <lams:Date value="${userData.attemptTime}"/>  </td>					 
-			</tr>				 
-		</c:forEach>		  	
-    </table>
-
-</div>
-<div id="footer"></div>
+	    <table class="alternative-color">
+		    <tr> <th NOWRAP colspan=2 align=center>  <fmt:message key="label.learnersVoted"/> </th> </tr>
+		
+			<tr> 
+		       <td NOWRAP align=center valign=top><b> <fmt:message key="label.user"/> </b></td>
+			   <td NOWRAP align=center valign=top><b> <fmt:message key="label.attemptTime"/> </b></td>
+		   </tr>
+		    
+			<c:forEach var="userData" items="${voteGeneralMonitoringDTO.mapStudentsVoted}">
+				<tr>		 
+						 <td NOWRAP valign=top align=center>    <c:out value="${userData.userName}"/>   </td>  
+						 <td NOWRAP valign=top align=center>    <lams:Date value="${userData.attemptTime}"/>  </td>					 
+				</tr>				 
+			</c:forEach>		  	
+	    </table>
+	
+	</div>
+	<div id="footer"></div>
 </body>
 </lams:html>