- * removes McQueContent with the given identifier question and mcContentUid, returns null
- * if not found.
- *
- *
- * @param mcContentUid
- */
- public void cleanAllQuestions(final Long mcContentUid);
-
- /**
- * *
- *
- * removes McQueContent with the given identifier mcContentUid
- *
- *
- * @param mcContentUid
- */
- public void cleanAllQuestionsSimple(final Long mcContentUid);
-
- /**
- * *
- *
* resets McQueContent with the given identifier mcContentUid
*
*
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
===================================================================
diff -u -r8ddb4345fdfc8904e5a7ff156cc63053e63741ca -r9a2c06691bf5157039ae82f36ec2f84c32eda8cb
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java (.../IMcUsrAttemptDAO.java) (revision 8ddb4345fdfc8904e5a7ff156cc63053e63741ca)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java (.../IMcUsrAttemptDAO.java) (revision 9a2c06691bf5157039ae82f36ec2f84c32eda8cb)
@@ -39,18 +39,6 @@
/**
* *
*
- * Return the persistent instance of a McUsrAttempt with the given identifier uid, returns null if not
- * found.
- *
- *
- * @param uid
- * @return McQueContent
- */
- public McUsrAttempt getMcUserAttemptByUID(Long uid);
-
- /**
- * *
- *
* saves McUsrAttempt with the given identifier mcUsrAttempt
*
*
@@ -73,17 +61,6 @@
/**
* *
*
- * removes McUsrAttempt with the given identifier uid
- *
- *
- * @param uid
- * @return
- */
- public void removeMcUsrAttemptByUID(Long uid);
-
- /**
- * *
- *
* removes McUsrAttempt with the given identifier mcUsrAttempt
*
*
@@ -93,16 +70,6 @@
public void removeMcUsrAttempt(McUsrAttempt mcUsrAttempt);
/**
- *
- * gets all the attempts (for all questions) for one user in one tool session
- *
- *
- * @param queUsrId
- * @return
- */
- public List getUserAttemptsForSession(Long queUsrId);
-
- /**
* Get the most recent attempts (for all questions) for one user in one tool session
*
* @param queUserUid
@@ -127,18 +94,4 @@
*/
public List getLatestAttemptsForAUserForOneQuestionContent(Long queUsrUid, Long mcQueContentId);
- /**
- * *
- *
- * returns a list of attempts with the given identifiers queUsrId and mcQueContentId and
- * attemptOrder
- *
- *
- * @param queUsrId
- * @param mcQueContentId
- * @param attemptOrder
- * @return
- */
- public List getAttemptByAttemptOrder(final Long queUsrUid, final Long mcQueContentId, final Integer attemptOrder);
-
}
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java
===================================================================
diff -u -r8ddb4345fdfc8904e5a7ff156cc63053e63741ca -r9a2c06691bf5157039ae82f36ec2f84c32eda8cb
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java (.../McOptionsContentDAO.java) (revision 8ddb4345fdfc8904e5a7ff156cc63053e63741ca)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java (.../McOptionsContentDAO.java) (revision 9a2c06691bf5157039ae82f36ec2f84c32eda8cb)
@@ -43,17 +43,13 @@
public class McOptionsContentDAO extends HibernateDaoSupport implements IMcOptionsContentDAO {
static Logger logger = Logger.getLogger(McOptionsContentDAO.class.getName());
- // private static final String FIND_MC_OPTIONS_CONTENT = "from " + McOptsContent.class.getName() +
- // " as mco where mc_que_content_id=?";
private static final String FIND_MC_OPTIONS_CONTENT = "from mcOptsContent in class McOptsContent where mcOptsContent.mcQueContentId=:mcQueContentUid order by mcOptsContent.displayOrder";
private static final String LOAD_OPTION_CONTENT_BY_OPTION_TEXT = "from mcOptsContent in class McOptsContent where mcOptsContent.mcQueOptionText=:option and mcOptsContent.mcQueContentId=:mcQueContentUid";
private static final String LOAD_PERSISTED_SELECTED_OPTIONS = "from mcOptsContent in class McOptsContent where mcOptsContent.mcQueContentId=:mcQueContentUid and mcOptsContent.correctOption = 1";
private static final String LOAD_CORRECT_OPTION = "from mcOptsContent in class McOptsContent where mcOptsContent.mcQueContentId=:mcQueContentUid and mcOptsContent.correctOption = 1";
- private static final String LOAD_MAX_UID = "from mcOptsContent in class McOptsContent";
-
public McOptsContent getMcOptionsContentByUID(Long uid) {
return (McOptsContent) this.getHibernateTemplate().get(McOptsContent.class, uid);
}
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java
===================================================================
diff -u -r8ddb4345fdfc8904e5a7ff156cc63053e63741ca -r9a2c06691bf5157039ae82f36ec2f84c32eda8cb
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java (.../McQueContentDAO.java) (revision 8ddb4345fdfc8904e5a7ff156cc63053e63741ca)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java (.../McQueContentDAO.java) (revision 9a2c06691bf5157039ae82f36ec2f84c32eda8cb)
@@ -42,12 +42,8 @@
private static final String LOAD_QUESTION_CONTENT_BY_CONTENT_ID = "from mcQueContent in class McQueContent where mcQueContent.mcContentId=:mcContentId order by mcQueContent.displayOrder";
- private static final String CLEAN_QUESTION_CONTENT_BY_CONTENT_ID_SIMPLE = "from mcQueContent in class McQueContent where mcQueContent.mcContentId=:mcContentId";
-
private static final String FIND_QUESTION_CONTENT_BY_UID = "from mcQueContent in class McQueContent where mcQueContent.uid=:uid";
- private static final String CLEAN_QUESTION_CONTENT_BY_CONTENT_ID = "from mcQueContent in class McQueContent where mcQueContent.mcContentId=:mcContentId";
-
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";
@@ -159,36 +155,6 @@
}
}
- public void cleanAllQuestions(final Long mcContentUid) {
- HibernateTemplate templ = this.getHibernateTemplate();
- List list = getSession().createQuery(CLEAN_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);
- }
- }
- }
-
- public void cleanAllQuestionsSimple(final Long mcContentUid) {
- HibernateTemplate templ = this.getHibernateTemplate();
- List list = getSession().createQuery(CLEAN_QUESTION_CONTENT_BY_CONTENT_ID_SIMPLE)
- .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);
- }
- }
- }
-
public List getNextAvailableDisplayOrder(final long mcContentId) {
HibernateTemplate templ = this.getHibernateTemplate();
List list = getSession().createQuery(GET_NEXT_AVAILABLE_DISPLAY_ORDER).setLong("mcContentId", mcContentId)
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
===================================================================
diff -u -r8ddb4345fdfc8904e5a7ff156cc63053e63741ca -r9a2c06691bf5157039ae82f36ec2f84c32eda8cb
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java (.../McUsrAttemptDAO.java) (revision 8ddb4345fdfc8904e5a7ff156cc63053e63741ca)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java (.../McUsrAttemptDAO.java) (revision 9a2c06691bf5157039ae82f36ec2f84c32eda8cb)
@@ -44,12 +44,6 @@
*/
public class McUsrAttemptDAO extends HibernateDaoSupport implements IMcUsrAttemptDAO {
- private static final String LOAD_ATTEMPT_BY_USER_SESSION = "from mcUsrAttempt in class McUsrAttempt where mcUsrAttempt.queUsrId=:queUsrUid";
-
- private static final String LOAD_ATTEMPT_BY_ATTEMPT_ORDER = "from mcUsrAttempt in class McUsrAttempt where mcUsrAttempt.queUsrId=:queUsrUid"
- + " and mcUsrAttempt.mcQueContentId=:mcQueContentId and mcUsrAttempt.attemptOrder=:attemptOrder"
- + " order by mcUsrAttempt.attemptOrder, mcUsrAttempt.mcOptionsContent.uid";
-
private static final String LOAD_LAST_ATTEMPT_BY_ATTEMPT_ORDER = "from mcUsrAttempt in class McUsrAttempt where mcUsrAttempt.mcQueUsr.uid=:queUsrUid"
+ " and mcUsrAttempt.mcQueContentId=:mcQueContentId and mcUsrAttempt.attemptOrder=mcUsrAttempt.mcQueUsr.lastAttemptOrder"
+ " order by mcUsrAttempt.mcOptionsContent.uid";
@@ -62,21 +56,10 @@
+ " and mcUsrAttempt.attemptOrder=mcUsrAttempt.mcQueUsr.lastAttemptOrder"
+ " order by mcUsrAttempt.mcQueContentId, mcUsrAttempt.mcOptionsContent.uid";
- public McUsrAttempt getMcUserAttemptByUID(Long uid) {
- return (McUsrAttempt) this.getHibernateTemplate().get(McUsrAttempt.class, uid);
- }
-
public void saveMcUsrAttempt(McUsrAttempt mcUsrAttempt) {
this.getHibernateTemplate().save(mcUsrAttempt);
}
- public List getUserAttemptsForSession(Long queUsrUid) {
- List list = getSession().createQuery(LOAD_ATTEMPT_BY_USER_SESSION).setLong("queUsrUid", queUsrUid.longValue())
- .list();
-
- return list;
- }
-
public List getLatestAttemptsForAUser(final Long queUserUid) {
return (List) getSession().createQuery(LOAD_LAST_ATTEMPTS).setLong("queUsrUid", queUserUid.longValue()).list();
}
@@ -98,24 +81,11 @@
.list();
}
- public List getAttemptByAttemptOrder(final Long queUsrUid, final Long mcQueContentId, final Integer attemptOrder) {
- List list = getSession().createQuery(LOAD_ATTEMPT_BY_ATTEMPT_ORDER).setLong("queUsrUid", queUsrUid.longValue())
- .setLong("mcQueContentId", mcQueContentId.longValue())
- .setInteger("attemptOrder", attemptOrder.intValue()).list();
- return list;
- }
-
public void updateMcUsrAttempt(McUsrAttempt mcUsrAttempt) {
this.getSession().setFlushMode(FlushMode.AUTO);
this.getHibernateTemplate().update(mcUsrAttempt);
}
- public void removeMcUsrAttemptByUID(Long uid) {
- McUsrAttempt mca = (McUsrAttempt) getHibernateTemplate().get(McUsrAttempt.class, uid);
- this.getSession().setFlushMode(FlushMode.AUTO);
- this.getHibernateTemplate().delete(mca);
- }
-
public void removeMcUsrAttempt(McUsrAttempt mcUsrAttempt) {
this.getSession().setFlushMode(FlushMode.AUTO);
this.getHibernateTemplate().delete(mcUsrAttempt);
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20130527.sql
===================================================================
diff -u
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20130527.sql (revision 0)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20130527.sql (revision 9a2c06691bf5157039ae82f36ec2f84c32eda8cb)
@@ -0,0 +1,13 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+
+----------------------Put all sql statements below here-------------------------
+
+--LDEV-3043 remove unused properties
+ALTER TABLE tl_lamc11_usr_attempt DROP COLUMN finished;
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java
===================================================================
diff -u -r8ddb4345fdfc8904e5a7ff156cc63053e63741ca -r9a2c06691bf5157039ae82f36ec2f84c32eda8cb
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java (.../McContent.java) (revision 8ddb4345fdfc8904e5a7ff156cc63053e63741ca)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java (.../McContent.java) (revision 9a2c06691bf5157039ae82f36ec2f84c32eda8cb)
@@ -152,13 +152,6 @@
public McContent() {
}
- /** minimal constructor */
- public McContent(Long mcContentId, Set mcQueContents, Set mcSessions) {
- this.mcContentId = mcContentId;
- this.mcQueContents = mcQueContents;
- this.mcSessions = mcSessions;
- }
-
/**
* gets called as part of the copyToolContent
*
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McOptsContent.java
===================================================================
diff -u -r8ddb4345fdfc8904e5a7ff156cc63053e63741ca -r9a2c06691bf5157039ae82f36ec2f84c32eda8cb
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McOptsContent.java (.../McOptsContent.java) (revision 8ddb4345fdfc8904e5a7ff156cc63053e63741ca)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McOptsContent.java (.../McOptsContent.java) (revision 9a2c06691bf5157039ae82f36ec2f84c32eda8cb)
@@ -58,40 +58,19 @@
/** persistent field */
private org.lamsfoundation.lams.tool.mc.pojos.McQueContent mcQueContent;
- /** persistent field */
- private Set mcUsrAttempts;
-
- public McOptsContent(Long mcQueOptionId, boolean correctOption, String mcQueOptionText,
- org.lamsfoundation.lams.tool.mc.pojos.McQueContent mcQueContent, Set mcUsrAttempts) {
- this.mcQueOptionId = mcQueOptionId;
- this.correctOption = correctOption;
- this.mcQueOptionText = mcQueOptionText;
- this.mcQueContent = mcQueContent;
- this.mcUsrAttempts = mcUsrAttempts;
- }
-
- public McOptsContent(boolean correctOption, String mcQueOptionText,
- org.lamsfoundation.lams.tool.mc.pojos.McQueContent mcQueContent, Set mcUsrAttempts) {
- this.correctOption = correctOption;
- this.mcQueOptionText = mcQueOptionText;
- this.mcQueContent = mcQueContent;
- this.mcUsrAttempts = mcUsrAttempts;
- }
-
public McOptsContent(Integer displayOrder, boolean correctOption, String mcQueOptionText,
- org.lamsfoundation.lams.tool.mc.pojos.McQueContent mcQueContent, Set mcUsrAttempts) {
+ org.lamsfoundation.lams.tool.mc.pojos.McQueContent mcQueContent) {
this.displayOrder = displayOrder;
this.correctOption = correctOption;
this.mcQueOptionText = mcQueOptionText;
this.mcQueContent = mcQueContent;
- this.mcUsrAttempts = mcUsrAttempts;
}
public static McOptsContent newInstance(McOptsContent mcOptsContent, McQueContent newMcQueContent)
{
McOptsContent newMcOptsContent = new McOptsContent(mcOptsContent.getDisplayOrder(),
- mcOptsContent.isCorrectOption(), mcOptsContent.getMcQueOptionText(), newMcQueContent, new TreeSet());
+ mcOptsContent.isCorrectOption(), mcOptsContent.getMcQueOptionText(), newMcQueContent);
return newMcOptsContent;
}
@@ -151,24 +130,6 @@
}
/**
- * @return Returns the mcUsrAttempts.
- */
-
- public Set getMcUsrAttempts() {
- if (this.mcUsrAttempts == null)
- setMcUsrAttempts(new HashSet());
- return this.mcUsrAttempts;
- }
-
- /**
- * @param mcUsrAttempts
- * The mcUsrAttempts to set.
- */
- public void setMcUsrAttempts(Set mcUsrAttempts) {
- this.mcUsrAttempts = mcUsrAttempts;
- }
-
- /**
* @return Returns the mcQueContentId.
*/
public Long getMcQueContentId() {
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McQueContent.java
===================================================================
diff -u -r8ddb4345fdfc8904e5a7ff156cc63053e63741ca -r9a2c06691bf5157039ae82f36ec2f84c32eda8cb
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McQueContent.java (.../McQueContent.java) (revision 8ddb4345fdfc8904e5a7ff156cc63053e63741ca)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McQueContent.java (.../McQueContent.java) (revision 9a2c06691bf5157039ae82f36ec2f84c32eda8cb)
@@ -68,46 +68,6 @@
/** persistent field */
private Set mcOptionsContents;
- /** full constructor */
- public McQueContent(Long mcQueContentId, String question, Integer displayOrder, McContent mcContent,
- Set mcUsrAttempts, Set mcOptionsContents) {
- this.mcQueContentId = mcQueContentId;
- this.question = question;
- this.displayOrder = displayOrder;
- this.mcContent = mcContent;
- this.mcUsrAttempts = mcUsrAttempts;
- this.mcOptionsContents = mcOptionsContents;
- }
-
- public McQueContent(String question, Integer displayOrder, McContent mcContent, Set mcUsrAttempts,
- Set mcOptionsContents) {
- this.question = question;
- this.displayOrder = displayOrder;
- this.mcContent = mcContent;
- this.mcUsrAttempts = mcUsrAttempts;
- this.mcOptionsContents = mcOptionsContents;
- }
-
- public McQueContent(String question, Integer displayOrder, Integer mark, McContent mcContent, Set mcUsrAttempts,
- Set mcOptionsContents) {
- this.question = question;
- this.displayOrder = displayOrder;
- this.mark = mark;
- this.mcContent = mcContent;
- this.mcUsrAttempts = mcUsrAttempts;
- this.mcOptionsContents = mcOptionsContents;
- }
-
- public McQueContent(String question, Integer displayOrder, String feedback, McContent mcContent, Set mcUsrAttempts,
- Set mcOptionsContents) {
- this.question = question;
- this.displayOrder = displayOrder;
- this.feedback = feedback;
- this.mcContent = mcContent;
- this.mcUsrAttempts = mcUsrAttempts;
- this.mcOptionsContents = mcOptionsContents;
- }
-
public McQueContent(String question, Integer displayOrder, Integer mark, String feedback, McContent mcContent,
Set mcUsrAttempts, Set mcOptionsContents) {
this.question = question;
@@ -119,45 +79,10 @@
this.mcOptionsContents = mcOptionsContents;
}
- public McQueContent(Long mcQueContentId, String question, Integer displayOrder, Set mcUsrAttempts,
- Set mcOptionsContents) {
- this.mcQueContentId = mcQueContentId;
- this.question = question;
- this.displayOrder = displayOrder;
- this.mcUsrAttempts = mcUsrAttempts;
- this.mcOptionsContents = mcOptionsContents;
- }
-
- public McQueContent(Long mcQueContentId, String question, Integer displayOrder, Integer mark, Set mcUsrAttempts,
- Set mcOptionsContents) {
- this.mcQueContentId = mcQueContentId;
- this.question = question;
- this.displayOrder = displayOrder;
- this.mark = mark;
- this.mcUsrAttempts = mcUsrAttempts;
- this.mcOptionsContents = mcOptionsContents;
- }
-
- public McQueContent(String question, Integer displayOrder, Set mcUsrAttempts, Set mcOptionsContents) {
- this.question = question;
- this.displayOrder = displayOrder;
- this.mcUsrAttempts = mcUsrAttempts;
- this.mcOptionsContents = mcOptionsContents;
- }
-
/** default constructor */
public McQueContent() {
}
- /** minimal constructor */
- public McQueContent(Long mcQueContentId, org.lamsfoundation.lams.tool.mc.pojos.McContent mcContent,
- Set mcUsrAttempts, Set mcOptionsContents) {
- this.mcQueContentId = mcQueContentId;
- this.mcContent = mcContent;
- this.mcUsrAttempts = mcUsrAttempts;
- this.mcOptionsContents = mcOptionsContents;
- }
-
/**
* gets called by copyToolContent
*
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McSession.java
===================================================================
diff -u -r8ddb4345fdfc8904e5a7ff156cc63053e63741ca -r9a2c06691bf5157039ae82f36ec2f84c32eda8cb
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McSession.java (.../McSession.java) (revision 8ddb4345fdfc8904e5a7ff156cc63053e63741ca)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McSession.java (.../McSession.java) (revision 9a2c06691bf5157039ae82f36ec2f84c32eda8cb)
@@ -61,9 +61,6 @@
private String session_name;
/** nullable persistent field */
- private Long mcContentId;
-
- /** nullable persistent field */
private org.lamsfoundation.lams.tool.mc.pojos.McContent mcContent;
/** persistent field */
@@ -125,14 +122,6 @@
this.mcSessionId = mcSessionId;
}
- public Long getMcContentId() {
- return this.mcContentId;
- }
-
- public void setMcContentId(Long mcContentId) {
- this.mcContentId = mcContentId;
- }
-
public org.lamsfoundation.lams.tool.mc.pojos.McContent getMcContent() {
return this.mcContent;
}
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McUsrAttempt.java
===================================================================
diff -u -r8ddb4345fdfc8904e5a7ff156cc63053e63741ca -r9a2c06691bf5157039ae82f36ec2f84c32eda8cb
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McUsrAttempt.java (.../McUsrAttempt.java) (revision 8ddb4345fdfc8904e5a7ff156cc63053e63741ca)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McUsrAttempt.java (.../McUsrAttempt.java) (revision 9a2c06691bf5157039ae82f36ec2f84c32eda8cb)
@@ -48,8 +48,6 @@
private Integer mark;
- private boolean finished;
-
private boolean attemptCorrect;
private boolean passed;
@@ -285,21 +283,6 @@
}
/**
- * @return Returns the finished.
- */
- public boolean isFinished() {
- return finished;
- }
-
- /**
- * @param finished
- * The finished to set.
- */
- public void setFinished(boolean finished) {
- this.finished = finished;
- }
-
- /**
* Get the mark for displaying to the user. If retries or passmark is off, then just check whether or not answer is
* correct If retries and passmark is on, then we only want the marks if the user has passed!
*/
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
===================================================================
diff -u -r8ddb4345fdfc8904e5a7ff156cc63053e63741ca -r9a2c06691bf5157039ae82f36ec2f84c32eda8cb
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java (.../IMcService.java) (revision 8ddb4345fdfc8904e5a7ff156cc63053e63741ca)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java (.../IMcService.java) (revision 9a2c06691bf5157039ae82f36ec2f84c32eda8cb)
@@ -90,12 +90,8 @@
public McOptsContent getMcOptionsContentByUID(Long uid) throws McApplicationException;
- public void cleanAllQuestionsSimple(final Long mcContentUid) throws McApplicationException;
-
public void resetAllQuestions(final Long mcContentUid) throws McApplicationException;
- public void cleanAllQuestions(final Long mcContentUid) throws McApplicationException;
-
public List refreshQuestionContent(final Long mcContentId) throws McApplicationException;
public List getAllQuestionEntriesSorted(final long mcContentId) throws McApplicationException;
@@ -226,9 +222,6 @@
public void persistFile(String uuid, boolean isOnlineFile, String fileName, McContent mcContent)
throws McApplicationException;
- public List getAttemptByAttemptOrder(final Long queUsrId, final Long mcQueContentId, final Integer attemptOrder)
- throws McApplicationException;
-
public McSession findMcSessionById(Long mcSessionId) throws McApplicationException;
public List getNextAvailableDisplayOrder(final long mcContentId) throws McApplicationException;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
===================================================================
diff -u -r8ddb4345fdfc8904e5a7ff156cc63053e63741ca -r9a2c06691bf5157039ae82f36ec2f84c32eda8cb
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision 8ddb4345fdfc8904e5a7ff156cc63053e63741ca)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision 9a2c06691bf5157039ae82f36ec2f84c32eda8cb)
@@ -257,15 +257,6 @@
}
}
- public void cleanAllQuestions(final Long mcContentUid) throws McApplicationException {
- try {
- mcQueContentDAO.cleanAllQuestions(mcContentUid);
- } catch (DataAccessException e) {
- throw new McApplicationException(
- "Exception occured when lams is cleaning all questions: " + e.getMessage(), e);
- }
- }
-
public List getNextAvailableDisplayOrder(final long mcContentId) throws McApplicationException {
try {
return mcQueContentDAO.getNextAvailableDisplayOrder(mcContentId);
@@ -352,17 +343,6 @@
}
}
- public List getAttemptByAttemptOrder(final Long queUsrId, final Long mcQueContentId, final Integer attemptOrder)
- throws McApplicationException {
- try {
- return mcUsrAttemptDAO.getAttemptByAttemptOrder(queUsrId, mcQueContentId, attemptOrder);
- } catch (DataAccessException e) {
- throw new McApplicationException(
- "Exception occured when lams is getting the learner's attempts by user id and que content id and attempt order: "
- + e.getMessage(), e);
- }
- }
-
public List getLatestAttemptsForAUser(final Long queUserUid) throws McApplicationException {
try {
return mcUsrAttemptDAO.getLatestAttemptsForAUser(queUserUid);
@@ -411,15 +391,6 @@
}
}
- public void cleanAllQuestionsSimple(final Long mcContentId) throws McApplicationException {
- try {
- mcQueContentDAO.cleanAllQuestionsSimple(mcContentId);
- } catch (DataAccessException e) {
- throw new McApplicationException(
- "Exception occured when lams is cleaning mc question content by mcContentId : " + e.getMessage(), e);
- }
- }
-
public List getAllQuestionEntries(final Long uid) throws McApplicationException {
try {
return mcQueContentDAO.getAllQuestionEntries(uid.longValue());
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java
===================================================================
diff -u -r8ddb4345fdfc8904e5a7ff156cc63053e63741ca -r9a2c06691bf5157039ae82f36ec2f84c32eda8cb
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java (.../AuthoringUtil.java) (revision 8ddb4345fdfc8904e5a7ff156cc63053e63741ca)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java (.../AuthoringUtil.java) (revision 9a2c06691bf5157039ae82f36ec2f84c32eda8cb)
@@ -1468,7 +1468,7 @@
// McOptsContent mcOptsContent = new McOptsContent(correctOption, candidateAnswer, mcQueContent, new
// TreeSet());
McOptsContent mcOptsContent = new McOptsContent(new Integer(displayOrder), correctOption, candidateAnswer,
- mcQueContent, new TreeSet());
+ mcQueContent);
mcService.saveMcOptionsContent(mcOptsContent);
}
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java
===================================================================
diff -u -r15cfa42a1cce71ee86152e5fedde483c213d4e0c -r9a2c06691bf5157039ae82f36ec2f84c32eda8cb
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java (.../McLearningAction.java) (revision 15cfa42a1cce71ee86152e5fedde483c213d4e0c)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java (.../McLearningAction.java) (revision 9a2c06691bf5157039ae82f36ec2f84c32eda8cb)
@@ -261,17 +261,6 @@
mcQueUsr.setResponseFinalised(true);
mcService.updateMcQueUsr(mcQueUsr);
- mcService.updateMcQueUsr(mcQueUsr);
-
- List userAttempts = mcService.getLatestAttemptsForAUser(mcQueUsr.getUid());
-
- Iterator itAttempts = userAttempts.iterator();
- while (itAttempts.hasNext()) {
- McUsrAttempt mcUsrAttempt = (McUsrAttempt) itAttempts.next();
- mcUsrAttempt.setFinished(true);
- mcService.updateMcUsrAttempt(mcUsrAttempt);
- }
-
response.sendRedirect(nextUrl);
return null;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McPedagogicalPlannerAction.java
===================================================================
diff -u -r8ddb4345fdfc8904e5a7ff156cc63053e63741ca -r9a2c06691bf5157039ae82f36ec2f84c32eda8cb
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McPedagogicalPlannerAction.java (.../McPedagogicalPlannerAction.java) (revision 8ddb4345fdfc8904e5a7ff156cc63053e63741ca)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McPedagogicalPlannerAction.java (.../McPedagogicalPlannerAction.java) (revision 9a2c06691bf5157039ae82f36ec2f84c32eda8cb)
@@ -134,7 +134,7 @@
McCandidateAnswersDTO answerDTO = candidateAnswerDTOList.get(candidateAnswerDTOIndex);
McOptsContent candidateAnswer = new McOptsContent(candidateAnswerDTOIndex + 1,
McAppConstants.CORRECT.equals(answerDTO.getCorrect()),
- answerDTO.getCandidateAnswer(), mcQueContent, null);
+ answerDTO.getCandidateAnswer(), mcQueContent);
candidateAnswer.setMcQueContentId(mcQueContent.getMcContentId());
candidateAnswers.add(candidateAnswer);
}