Update of
/var/cvs/contributions/didactor2/src/education/templates/education/mcquestions
In directory james.mmbase.org:/tmp/cvs-serv15121/mcquestions
Modified Files:
index.jsp ratemcquestions.jsp
Log Message:
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/templates/education/mcquestions
Index: index.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/mcquestions/index.jsp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- index.jsp 7 Nov 2008 16:52:37 -0000 1.11
+++ index.jsp 10 Nov 2008 17:54:02 -0000 1.12
@@ -1,5 +1,7 @@
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"; version="2.0"
+<jsp:root
+ xmlns:jsp="http://java.sun.com/JSP/Page"; version="2.0"
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
+ xmlns:mm-t="urn:jsptagdir:/WEB-INF/tags/mm/u"
xmlns:di="http://www.didactor.nl/ditaglib_1.0"; >
<mm:content postprocessor="none">
<mm:cloud method="delegate">
@@ -22,6 +24,15 @@
-->
<mm:node number="$question">
+
+ <mm:isnotempty referid="madetest">
+ <mm:relatednodes
+ type="givenanswers" orderby="number" directions="down" max="1">
+ <mm:relatednodes type="mcanswers" id="givenanswers" />
+ </mm:relatednodes>
+ </mm:isnotempty>
+
+
<mm:field name="showtitle">
<mm:compare value="1">
<h2><mm:field name="title"/></h2>
@@ -67,8 +78,9 @@
<mm:field name="description" escape="tagstripper(xss)"/>
</mm:relatednodes>
</div>
+ ${mm:contains(givenanswers, _node)} ${question} ${givenanswers}
/ ${_node}
<mm:import externid="${question}" id="answer" />
- <mm:radio name="${question}" value="${_node}"
compare="${answer}" />
+ <mm-t:radio type="checkbox" name="${question}_${_node}"
value="${_node}" checked="${mm:contains(givenanswers, _node)}" />
<mm:field name="text" />
<!-- Each answer on a new line -->
@@ -83,7 +95,7 @@
<select name="${question}">
<mm:import externid="${question}" id="answer" />
<mm:listnodes referid="answerlist">
- <mm:option compare="question" value="${_node}"><mm:field
name="text"/></mm:option>
+ <mm:option compare="question" value="${_node}"
selected="${mm:contains(givenanswers, _node)}"><mm:field
name="text"/></mm:option>
</mm:listnodes>
</select>
</mm:compare>
@@ -92,8 +104,7 @@
<!-- Generate layout for checkboxes (multiple correct answers to be
chosen) -->
<mm:compare referid="questiontype" value="1">
<mm:listnodes referid="answerlist">
- <mm:import externid="${question}_${_node}" id="answer" />
- <mm:radio type="checkbox" name="${question}_${_node}"
value="${_node}" compare="${answer}" />
+ <mm:radio type="checkbox" name="${question}_${_node}"
value="${_node}" checked="${mm:contains(givenanswers, _node)}" />
<mm:field name="text"/>
<!-- Each answer on a new line -->
<mm:compare referid="questionlayout" valueset="0,3">
Index: ratemcquestions.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/mcquestions/ratemcquestions.jsp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- ratemcquestions.jsp 26 Jun 2008 13:56:09 -0000 1.14
+++ ratemcquestions.jsp 10 Nov 2008 17:54:02 -0000 1.15
@@ -10,6 +10,10 @@
<mm:import externid="question" required="true"/>
<mm:import externid="madetest" required="true"/>
+
+ <mm:import externid="answernode" />
+
+
<!--
Multiple choice questions
types:
@@ -19,12 +23,23 @@
<mm:node number="$question" id="my_question">
- <mm:createnode type="givenanswers" id="my_givenanswers">
- <mm:setfield name="score">0</mm:setfield>
- </mm:createnode>
+ <mm:notpresent referid="answernode">
+ <mm:remove referid="answernode" />
+ <mm:createnode id="answernode" type="givenanswers" />
+ <mm:createrelation role="related" source="madetest"
destination="answernode" />
+ <mm:createrelation role="related" source="question"
destination="answernode" />
+ </mm:notpresent>
+ <mm:present referid="answernode">
+ <mm:node id="answernode" referid="answernode">
+ <mm:listrelations type="mcanswers">
+ <mm:deletenode />
+ </mm:listrelations>
+ </mm:node>
+ </mm:present>
- <mm:createrelation role="related" source="madetest"
destination="my_givenanswers"/>
- <mm:createrelation role="related" source="question"
destination="my_givenanswers"/>
+ <mm:node referid="answernode" id="my_givenanswers">
+ <mm:setfield name="score">0</mm:setfield>
+ </mm:node>
<mm:field name="type" write="false">
@@ -54,7 +69,7 @@
<mm:field id="correct" name="correct" write="false"/>
<mm:import externid="${question}_${_node}" id="givenanswer" />
-
+.
<mm:log>Value for givenanser (${question}_${_node}):
${givenanswer}</mm:log>
<mm:present referid="givenanswer">
<mm:log>this answer was given</mm:log>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
