- * Return a list of McQueContent with the given identifier question and mcContentUid,
+ * Return a list of McQueContent with the given identifier questionDescription and mcContentUid,
* returns null if not found.
*
- * Return a list of McQueContent with the given identifier question and mcContentUid,
- * returns null if not found.
- *
* saves McQueContent with the given identifier mcQueContent
*
- * DTO that holds question and candidate answers for the learner environment + * DTO that holds questionDescription and candidate answers for the learner environment *
* * @author Ozgur Demirtas */ public class AnswerDTO implements Comparable- * Persistent object/bean that defines the question content for the MCQ tool. Provides accessors and mutators to get/set + * Persistent object/bean that defines the questionDescription content for the MCQ tool. Provides accessors and mutators to get/set * attributes It maps to database table: tl_lamc11_que_content *
* @@ -54,7 +54,7 @@ private static final long serialVersionUID = 4022287106119453962L; /** - * It stores sha1(question) value that allows us to search for the McQueContentc with the same question + * It stores sha1(questionDescription) value that allows us to search for the McQueContentc with the same questionDescription */ @Column(name = "question_hash") private String questionHash; @@ -65,7 +65,7 @@ //DTO fields @Transient - private String escapedQuestion; + private String escapedDescription; public McQueContent(QbQuestion qbQuestion, String questionHash, Integer displayOrder, McContent mcContent) { this.qbQuestion = qbQuestion; @@ -82,26 +82,34 @@ * * Copy constructor * - * @param queContent - * the original qa question content - * @return the new qa question content object + * @param questionDescription + * the original qa questionDescription content + * @return the new qa questionDescription content object */ - public static McQueContent newInstance(McQueContent queContent, McContent newMcContent) { - McQueContent newQueContent = new McQueContent(queContent.getQbQuestion(), queContent.getQuestionHash(), - queContent.getDisplayOrder(), newMcContent); + public static McQueContent newInstance(McQueContent question, McContent newMcContent) { + McQueContent newQueContent = new McQueContent(question.getQbQuestion(), question.getQuestionHash(), + question.getDisplayOrder(), newMcContent); return newQueContent; } - - public String getQuestion() { + + public String getName() { return this.qbQuestion.getName(); } - public void setQuestion(String question) { - this.qbQuestion.setName(question); + public void setName(String name) { + this.qbQuestion.setName(name); } + public String getDescription() { + return this.qbQuestion.getDescription(); + } + + public void setDescription(String description) { + this.qbQuestion.setDescription(description); + } + /** - * Returns sha1(question) value that allows us to search for the McQueContent with the same question + * Returns sha1(questionDescription) value that allows us to search for the McQueContent with the same questionDescription */ public String getQuestionHash() { return questionHash; @@ -111,7 +119,7 @@ this.questionHash = questionHash; } - public org.lamsfoundation.lams.tool.mc.model.McContent getMcContent() { + public McContent getMcContent() { return this.mcContent; } @@ -179,11 +187,11 @@ qbQuestion.setMaxMark(mark); } - public String getEscapedQuestion() { - return this.escapedQuestion; + public String getEscapedDescription() { + return this.escapedDescription; } - public void setEscapedQuestion(String escapedQuestion) { - this.escapedQuestion = escapedQuestion; + public void setEscapedDescription(String escapedDescription) { + this.escapedDescription = escapedDescription; } } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java =================================================================== diff -u -rf24a82ae2ef1cbaa92dfd356226f6c3edcd5e404 -r9ca39edffd0c57ba7deeb38316f5a0f7b0d8fe44 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java (.../IMcService.java) (revision f24a82ae2ef1cbaa92dfd356226f6c3edcd5e404) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java (.../IMcService.java) (revision 9ca39edffd0c57ba7deeb38316f5a0f7b0d8fe44) @@ -108,8 +108,6 @@ void releaseQuestionsFromCache(McContent content); - List refreshQuestionContent(final Long mcContentId) throws McApplicationException; - List getAllQuestionsSorted(final long mcContentId); McQueContent getQuestionByUid(Long uid); @@ -180,7 +178,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 + * for a particular activity such as the answer to the third questionDescription contains the word Koala and hence the need for * the toolContentId * * @return SortedMap of ToolOutputDefinitions with the key being the name of each definition @@ -268,7 +266,7 @@ List|
- |
|
|
|
|
| ${dto.displayOrder}) + | + ${answerDto.displayOrder}) | -
+ + |
|||||||||||||||||
|
[
|
|||||||||||||||||||
|
- checked="checked"
|
- | @@ -67,10 +71,10 @@||||||||||||||||||
| ${dto.displayOrder}) | -+ ${answerDto.displayOrder}) + | +
+ + |
|||||||
| [ |
+ [ |
||||||||
|
- checked="checked"
/>
|
- | @@ -62,10 +68,10 @@
| ${status.count}) | -+ ${status.count}) + | +
+ + |