Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml
===================================================================
diff -u -rc1e9ee48a9fd7b643af1e4eae6b9806b9aae18d1 -r8742c4d01b2ac066988448e0c64d76998d5f4f5b
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml (.../McOptsContent.hbm.xml) (revision c1e9ee48a9fd7b643af1e4eae6b9806b9aae18d1)
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml (.../McOptsContent.hbm.xml) (revision 8742c4d01b2ac066988448e0c64d76998d5f4f5b)
@@ -38,6 +38,18 @@
length="250"
>
+
+
+
+
Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml
===================================================================
diff -u -rc1e9ee48a9fd7b643af1e4eae6b9806b9aae18d1 -r8742c4d01b2ac066988448e0c64d76998d5f4f5b
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml (.../McQueContent.hbm.xml) (revision c1e9ee48a9fd7b643af1e4eae6b9806b9aae18d1)
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml (.../McQueContent.hbm.xml) (revision 8742c4d01b2ac066988448e0c64d76998d5f4f5b)
@@ -40,6 +40,13 @@
+
+
-
+
@@ -267,6 +267,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_lamc/db/sql/create_lams_tool_lamc.sql
===================================================================
diff -u -ref0a9c1380cd02cc24d2d7f9d036a8acc76059d2 -r8742c4d01b2ac066988448e0c64d76998d5f4f5b
--- lams_tool_lamc/db/sql/create_lams_tool_lamc.sql (.../create_lams_tool_lamc.sql) (revision ef0a9c1380cd02cc24d2d7f9d036a8acc76059d2)
+++ lams_tool_lamc/db/sql/create_lams_tool_lamc.sql (.../create_lams_tool_lamc.sql) (revision 8742c4d01b2ac066988448e0c64d76998d5f4f5b)
@@ -27,6 +27,7 @@
CREATE TABLE lams.tl_lamc11_que_content (
uid BIGINT(20) NOT NULL AUTO_INCREMENT
, question VARCHAR(255)
+ , disabled TINYINT(1) NOT NULL DEFAULT 0
, display_order INT(5)
, mc_content_id BIGINT(20) NOT NULL
, PRIMARY KEY (uid)
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptsContent.java
===================================================================
diff -u -rb7e4d4f379a4a90d25f4af4a5d421310cb6bf8e3 -r8742c4d01b2ac066988448e0c64d76998d5f4f5b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptsContent.java (.../McOptsContent.java) (revision b7e4d4f379a4a90d25f4af4a5d421310cb6bf8e3)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptsContent.java (.../McOptsContent.java) (revision 8742c4d01b2ac066988448e0c64d76998d5f4f5b)
@@ -43,6 +43,9 @@
/** nullable persistent field */
private String mcQueOptionText;
+ /** non persistent field */
+ private Long mcQueContentId;
+
/** persistent field */
private org.lamsfoundation.lams.tool.mc.McQueContent mcQueContent;
@@ -139,4 +142,17 @@
public void setMcUsrAttempts(Set mcUsrAttempts) {
this.mcUsrAttempts = mcUsrAttempts;
}
+
+ /**
+ * @return Returns the mcQueContentId.
+ */
+ public Long getMcQueContentId() {
+ return mcQueContentId;
+ }
+ /**
+ * @param mcQueContentId The mcQueContentId to set.
+ */
+ public void setMcQueContentId(Long mcQueContentId) {
+ this.mcQueContentId = mcQueContentId;
+ }
}
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.java
===================================================================
diff -u -rc36523c3640d5bda32e4b738383c2595ca9603cf -r8742c4d01b2ac066988448e0c64d76998d5f4f5b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.java (.../McQueContent.java) (revision c36523c3640d5bda32e4b738383c2595ca9603cf)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.java (.../McQueContent.java) (revision 8742c4d01b2ac066988448e0c64d76998d5f4f5b)
@@ -44,6 +44,9 @@
/** nullable persistent field */
private Integer displayOrder;
+
+ /** persistent field */
+ private boolean disabled;
/** non persistent field */
private Long mcContentId;
@@ -204,4 +207,16 @@
public void setMcContentId(Long mcContentId) {
this.mcContentId = mcContentId;
}
+ /**
+ * @return Returns the disabled.
+ */
+ public boolean isDisabled() {
+ return disabled;
+ }
+ /**
+ * @param disabled The disabled to set.
+ */
+ public void setDisabled(boolean disabled) {
+ this.disabled = disabled;
+ }
}
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties
===================================================================
diff -u -rb261a00d2159e4a3b753a6637fe2891e24819595 -r8742c4d01b2ac066988448e0c64d76998d5f4f5b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties (.../McResources.properties) (revision b261a00d2159e4a3b753a6637fe2891e24819595)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties (.../McResources.properties) (revision 8742c4d01b2ac066988448e0c64d76998d5f4f5b)
@@ -27,6 +27,7 @@
label.report.title =Report Title
label.monitoringReport.title =Monitoring Report Title
label.report.endLearningMessage =End of Activity Message
+label.question =Question:
label.question1 =Question 1
radiobox.defineLater =Define Later
radiobox.synchInMonitor =Sync in Monitor
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcOptionsContentDAO.java
===================================================================
diff -u -r284785a0cc2d61ac8a129a69888b3442141904ab -r8742c4d01b2ac066988448e0c64d76998d5f4f5b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcOptionsContentDAO.java (.../IMcOptionsContentDAO.java) (revision 284785a0cc2d61ac8a129a69888b3442141904ab)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcOptionsContentDAO.java (.../IMcOptionsContentDAO.java) (revision 8742c4d01b2ac066988448e0c64d76998d5f4f5b)
@@ -38,6 +38,8 @@
public List findMcOptionsContentByQueId(Long mcQueContentId);
+ public McOptsContent getOptionContentByOptionText(final String option, final Long mcQueContentUid);
+
public void saveMcOptionsContent(McOptsContent mcOptionsContent);
public void updateMcOptionsContent(McOptsContent mcOptionsContent);
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java
===================================================================
diff -u -r284785a0cc2d61ac8a129a69888b3442141904ab -r8742c4d01b2ac066988448e0c64d76998d5f4f5b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java (.../McOptionsContentDAO.java) (revision 284785a0cc2d61ac8a129a69888b3442141904ab)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java (.../McOptionsContentDAO.java) (revision 8742c4d01b2ac066988448e0c64d76998d5f4f5b)
@@ -28,6 +28,7 @@
import org.hibernate.FlushMode;
import org.lamsfoundation.lams.tool.mc.McContent;
import org.lamsfoundation.lams.tool.mc.McOptsContent;
+import org.lamsfoundation.lams.tool.mc.McQueContent;
import org.lamsfoundation.lams.tool.mc.dao.IMcOptionsContentDAO;
import org.springframework.orm.hibernate3.HibernateTemplate;
import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
@@ -46,6 +47,8 @@
private static final String FIND_MC_OPTIONS_CONTENT = "from " + McOptsContent.class.getName() + " as mco where mc_que_content_id=?";
+ private static final String LOAD_OPTION_CONTENT_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()
@@ -66,6 +69,21 @@
}
+ public McOptsContent getOptionContentByOptionText(final String option, final Long mcQueContentUid)
+ {
+ HibernateTemplate templ = this.getHibernateTemplate();
+ List list = getSession().createQuery(LOAD_OPTION_CONTENT_BY_OPTION_TEXT)
+ .setString("option", option)
+ .setLong("mcQueContentUid", mcQueContentUid.longValue())
+ .list();
+
+ if(list != null && list.size() > 0){
+ McOptsContent mcq = (McOptsContent) list.get(0);
+ return mcq;
+ }
+ return null;
+ }
+
public void saveMcOptionsContent(McOptsContent mcOptsContent)
{
@@ -97,6 +115,7 @@
while (listIterator.hasNext())
{
McOptsContent mcOptsContent=(McOptsContent)listIterator.next();
+ this.getSession().setFlushMode(FlushMode.AUTO);
templ.delete(mcOptsContent);
}
}
@@ -105,6 +124,7 @@
public void removeMcOptionsContent(McOptsContent mcOptsContent)
{
+ this.getSession().setFlushMode(FlushMode.AUTO);
this.getHibernateTemplate().delete(mcOptsContent);
}
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java
===================================================================
diff -u -r284785a0cc2d61ac8a129a69888b3442141904ab -r8742c4d01b2ac066988448e0c64d76998d5f4f5b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java (.../McQueContentDAO.java) (revision 284785a0cc2d61ac8a129a69888b3442141904ab)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java (.../McQueContentDAO.java) (revision 8742c4d01b2ac066988448e0c64d76998d5f4f5b)
@@ -24,6 +24,7 @@
import java.util.List;
import org.apache.log4j.Logger;
+import org.hibernate.FlushMode;
import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.lamsfoundation.lams.tool.mc.McQueContent;
@@ -106,12 +107,14 @@
public void removeMcQueContentByUID(Long uid)
{
McQueContent mcq = (McQueContent)getHibernateTemplate().get(McQueContent.class, uid);
+ this.getSession().setFlushMode(FlushMode.AUTO);
this.getHibernateTemplate().delete(mcq);
}
public void removeMcQueContent(McQueContent mcQueContent)
{
+ this.getSession().setFlushMode(FlushMode.AUTO);
this.getHibernateTemplate().delete(mcQueContent);
}
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java
===================================================================
diff -u -r4336aafba788b801aa78c2dc27f8d07a2f932be7 -r8742c4d01b2ac066988448e0c64d76998d5f4f5b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java (.../McSessionDAO.java) (revision 4336aafba788b801aa78c2dc27f8d07a2f932be7)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java (.../McSessionDAO.java) (revision 8742c4d01b2ac066988448e0c64d76998d5f4f5b)
@@ -124,6 +124,7 @@
/** @see org.lamsfoundation.lams.tool.mc.dao.IMcSessionDAO#removeMcSession(org.lamsfoundation.lams.tool.mc.McSession) */
public void removeMcSession(McSession mcSession)
{
+ this.getSession().setFlushMode(FlushMode.AUTO);
this.getHibernateTemplate().delete(mcSession);
}
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java
===================================================================
diff -u -r4336aafba788b801aa78c2dc27f8d07a2f932be7 -r8742c4d01b2ac066988448e0c64d76998d5f4f5b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java (.../McUserDAO.java) (revision 4336aafba788b801aa78c2dc27f8d07a2f932be7)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java (.../McUserDAO.java) (revision 8742c4d01b2ac066988448e0c64d76998d5f4f5b)
@@ -133,6 +133,7 @@
/** @see org.lamsfoundation.lams.tool.mc.dao.IMcUserDAO#removeMcUser(org.lamsfoundation.lams.tool.mc.McUser) */
public void removeMcUser(McQueUsr mcUser)
{
+ this.getSession().setFlushMode(FlushMode.AUTO);
this.getHibernateTemplate().delete(mcUser);
}
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
===================================================================
diff -u -rb7e4d4f379a4a90d25f4af4a5d421310cb6bf8e3 -r8742c4d01b2ac066988448e0c64d76998d5f4f5b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java (.../McUsrAttemptDAO.java) (revision b7e4d4f379a4a90d25f4af4a5d421310cb6bf8e3)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java (.../McUsrAttemptDAO.java) (revision 8742c4d01b2ac066988448e0c64d76998d5f4f5b)
@@ -23,6 +23,7 @@
package org.lamsfoundation.lams.tool.mc.dao.hibernate;
import org.apache.log4j.Logger;
+import org.hibernate.FlushMode;
import org.lamsfoundation.lams.tool.mc.McUsrAttempt;
import org.lamsfoundation.lams.tool.mc.dao.IMcUsrAttemptDAO;
import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
@@ -60,12 +61,14 @@
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/service/IMcService.java
===================================================================
diff -u -r284785a0cc2d61ac8a129a69888b3442141904ab -r8742c4d01b2ac066988448e0c64d76998d5f4f5b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java (.../IMcService.java) (revision 284785a0cc2d61ac8a129a69888b3442141904ab)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java (.../IMcService.java) (revision 8742c4d01b2ac066988448e0c64d76998d5f4f5b)
@@ -75,6 +75,8 @@
public void removeMcOptionsContentByQueId(Long mcQueContentId) throws McApplicationException;
+ public void removeMcOptionsContent(McOptsContent mcOptsContent);
+
public McQueContent getQuestionContentByQuestionText(final String question, final Long mcContentUid);
public McSession retrieveMcSession(Long mcSessionId) throws McApplicationException;
@@ -99,6 +101,8 @@
public void saveMcOptionsContent(McOptsContent mcOptsContent) throws McApplicationException;
+ public McOptsContent getOptionContentByOptionText(final String option, final Long mcQueContentUid);
+
public void updateMcOptionsContent(McOptsContent mcOptsContent) throws McApplicationException;
public void deleteMcOptionsContent(McOptsContent mcOptsContent) throws McApplicationException;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
===================================================================
diff -u -r284785a0cc2d61ac8a129a69888b3442141904ab -r8742c4d01b2ac066988448e0c64d76998d5f4f5b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision 284785a0cc2d61ac8a129a69888b3442141904ab)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision 8742c4d01b2ac066988448e0c64d76998d5f4f5b)
@@ -285,6 +285,20 @@
e);
}
}
+
+ 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);
+ }
+ }
public McQueContent getQuestionContentByQuestionText(final String question, final Long mcContentId)
@@ -478,6 +492,21 @@
}
}
+ 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);
+ }
+ }
+
+
public void updateMcOptionsContent(McOptsContent mcOptsContent) throws McApplicationException
{
try
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
===================================================================
diff -u -rb261a00d2159e4a3b753a6637fe2891e24819595 -r8742c4d01b2ac066988448e0c64d76998d5f4f5b
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java (.../McAction.java) (revision b261a00d2159e4a3b753a6637fe2891e24819595)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java (.../McAction.java) (revision 8742c4d01b2ac066988448e0c64d76998d5f4f5b)
@@ -236,10 +236,11 @@
request.setAttribute(USER_ACTION, userAction);
logger.debug("userAction:" + userAction);
- Map mapQuestionsContent=(Map) request.getSession().getAttribute(MAP_QUESTIONS_CONTENT);
+ /*Map mapQuestionsContent=(Map) request.getSession().getAttribute(MAP_QUESTIONS_CONTENT);
logger.debug("mapQuestionsContent: " + mapQuestionsContent);
+ */
- mapQuestionsContent=repopulateMap(mapQuestionsContent, request, "questionContent");
+ Map mapQuestionsContent=repopulateMap(request, "questionContent");
logger.debug("mapQuestionsContent after shrinking: " + mapQuestionsContent);
logger.debug("mapQuestionsContent size after shrinking: " + mapQuestionsContent.size());
@@ -255,10 +256,12 @@
request.setAttribute(USER_ACTION, userAction);
logger.debug("userAction:" + userAction);
+ /*
Map mapQuestionsContent=(Map) request.getSession().getAttribute(MAP_QUESTIONS_CONTENT);
logger.debug("mapQuestionsContent: " + mapQuestionsContent);
+ */
- mapQuestionsContent=repopulateMap(mapQuestionsContent, request, "questionContent");
+ Map mapQuestionsContent=repopulateMap(request, "questionContent");
logger.debug("mapQuestionsContent after shrinking: " + mapQuestionsContent);
logger.debug("mapQuestionsContent size after shrinking: " + mapQuestionsContent.size());
@@ -310,12 +313,15 @@
request.setAttribute(USER_ACTION, userAction);
logger.debug("userAction:" + userAction);
+ /*
Map mapQuestionsContent=(Map) request.getSession().getAttribute(MAP_QUESTIONS_CONTENT);
logger.debug("mapQuestionsContent: " + mapQuestionsContent);
+ */
- mapQuestionsContent=repopulateMap(mapQuestionsContent, request, "questionContent");
+ Map mapQuestionsContent=repopulateMap(request, "questionContent");
logger.debug("mapQuestionsContent after shrinking: " + mapQuestionsContent);
logger.debug("mapQuestionsContent size after shrinking: " + mapQuestionsContent.size());
+ request.getSession().setAttribute(MAP_QUESTIONS_CONTENT, mapQuestionsContent);
String questionIndex =mcAuthoringForm.getQuestionIndex();
logger.debug("questionIndex:" + questionIndex);
@@ -410,10 +416,12 @@
request.setAttribute(USER_ACTION, userAction);
logger.debug("userAction:" + userAction);
+ /*
Map mapOptionsContent=(Map) request.getSession().getAttribute(MAP_OPTIONS_CONTENT);
logger.debug("mapOptionsContent: " + mapOptionsContent);
+ */
- mapOptionsContent=repopulateMap(mapOptionsContent, request,"optionContent");
+ Map mapOptionsContent=repopulateMap(request,"optionContent");
logger.debug("mapOptionsContent after shrinking: " + mapOptionsContent);
logger.debug("mapOptionsContent size after shrinking: " + mapOptionsContent.size());
@@ -462,18 +470,18 @@
String optionIndex =mcAuthoringForm.getOptionIndex();
logger.debug("optionIndex:" + optionIndex);
-
+ /*
Map mapOptionsContent=(Map) request.getSession().getAttribute(MAP_QUESTIONS_CONTENT);
logger.debug("mapQuestionsContent: " + mapOptionsContent);
+ */
- mapOptionsContent=repopulateMap(mapOptionsContent, request, "optionContent");
+ Map mapOptionsContent=repopulateMap(request, "optionContent");
logger.debug("mapOptionsContent after shrinking: " + mapOptionsContent);
logger.debug("mapOptionsContent size after shrinking: " + mapOptionsContent.size());
String deletableOptionEntry=(String)mapOptionsContent.get(optionIndex);
logger.debug("deletableOptionEntry:" + deletableOptionEntry);
-
if (deletableOptionEntry != null)
{
if (!(deletableOptionEntry.equals("")))
@@ -483,20 +491,18 @@
request.getSession().setAttribute(MAP_OPTIONS_CONTENT, mapOptionsContent);
logger.debug("updated Options Map: " + request.getSession().getAttribute(MAP_OPTIONS_CONTENT));
- /*
- Long toolContentId=(Long)request.getSession().getAttribute(TOOL_CONTENT_ID);
- logger.debug("toolContentId:" + toolContentId);
+ Long selectedQuestionContentUid=(Long) request.getSession().getAttribute(SELECTED_QUESTION_CONTENT_UID);
+ logger.debug("selectedQuestionContentUid:" + selectedQuestionContentUid);
- McQueContent mcQueContent =mcService.getQuestionContentByQuestionText(deletableQuestionEntry, toolContentId);
- logger.debug("mcQueContent:" + mcQueContent);
+ logger.debug("deletableOptionEntry: " + deletableOptionEntry + "mcQueContentUid: " + selectedQuestionContentUid);
+ McOptsContent mcOptsContent=mcService.getOptionContentByOptionText(deletableOptionEntry, selectedQuestionContentUid);
+ logger.debug("mcOptsContent: " + mcOptsContent);
- if (mcQueContent != null)
+ if (mcOptsContent != null)
{
- mcQueContent=mcService.retrieveMcQueContentByUID(mcQueContent.getUid());
- mcService.removeMcQueContent(mcQueContent);
- logger.debug("removed mcQueContent from DB:" + mcQueContent);
+ mcService.removeMcOptionsContent(mcOptsContent);
+ logger.debug("removed mcOptsContent from DB:" + mcOptsContent);
}
- */
}
}
@@ -557,7 +563,7 @@
* @param request
* @return
*/
- protected Map repopulateMap(Map mapQuestionContent, HttpServletRequest request, String parameterType)
+ protected Map repopulateMap(HttpServletRequest request, String parameterType)
{
Map mapTempQuestionsContent= new TreeMap(new McComparator());
logger.debug("parameterType: " + parameterType);
@@ -741,7 +747,7 @@
Long toolContentId=(Long)request.getSession().getAttribute(TOOL_CONTENT_ID);
if ((toolContentId != null) && (toolContentId.longValue() != 0))
{
- logger.debug("passed TOOL_CONTENT_ID : " + toolContentId);
+ logger.debug("TOOL_CONTENT_ID : " + toolContentId);
mcContent= mcService.retrieveMc(toolContentId);
logger.debug("mcContent: " + mcContent);
}
@@ -773,6 +779,7 @@
mcService.createMcQue(mcQueContent);
logger.debug("persisted mcQueContent: " + mcQueContent);
}
+
}
}
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml
===================================================================
diff -u -rc1e9ee48a9fd7b643af1e4eae6b9806b9aae18d1 -r8742c4d01b2ac066988448e0c64d76998d5f4f5b
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml (.../McOptsContent.hbm.xml) (revision c1e9ee48a9fd7b643af1e4eae6b9806b9aae18d1)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml (.../McOptsContent.hbm.xml) (revision 8742c4d01b2ac066988448e0c64d76998d5f4f5b)
@@ -38,6 +38,18 @@
length="250"
>
+
+
+
+
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml
===================================================================
diff -u -rc1e9ee48a9fd7b643af1e4eae6b9806b9aae18d1 -r8742c4d01b2ac066988448e0c64d76998d5f4f5b
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml (.../McQueContent.hbm.xml) (revision c1e9ee48a9fd7b643af1e4eae6b9806b9aae18d1)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml (.../McQueContent.hbm.xml) (revision 8742c4d01b2ac066988448e0c64d76998d5f4f5b)
@@ -40,6 +40,13 @@
+
+