Update of
/var/cvs/contributions/didactor2/src/education/templates/education/openquestions
In directory james.mmbase.org:/tmp/cvs-serv15121/openquestions
Modified Files:
index.jsp rateopenquestions.jsp
Log Message:
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/templates/education/openquestions
Index: index.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/openquestions/index.jsp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- index.jsp 7 Nov 2008 16:53:42 -0000 1.16
+++ index.jsp 10 Nov 2008 17:54:02 -0000 1.17
@@ -8,16 +8,13 @@
<mm:node number="$question">
-
<mm:isnotempty referid="madetest">
- <mm:relatedcontainer path="givenanswers,madetests">
+ <mm:relatednodescontainer path="givenanswers,madetests"
element="givenanswers">
<mm:constraint field="madetests.number" value="$madetest"/>
- <mm:related>
- <mm:node element="givenanswers">
+ <mm:relatednodes>
<mm:field name="text" id="answer" write="false"/>
- </mm:node>
- </mm:related>
- </mm:relatedcontainer>
+ </mm:relatednodes>
+ </mm:relatednodescontainer>
</mm:isnotempty>
<mm:field name="showtitle">
Index: rateopenquestions.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/openquestions/rateopenquestions.jsp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- rateopenquestions.jsp 26 Jun 2008 14:06:32 -0000 1.16
+++ rateopenquestions.jsp 10 Nov 2008 17:54:02 -0000 1.17
@@ -11,6 +11,16 @@
<mm:import externid="question" required="true"/>
<mm:import externid="madetest" required="true"/>
+ <mm:import externid="givenanswer" />
+ <mm:notpresent referid="givenanswer">
+ <mm:createnode id="answernode" type="givenanswers" />
+ <mm:createrelation role="related" source="madetest"
destination="givenanswer"/>
+ <mm:createrelation role="related" source="question"
destination="givenanswer"/>
+ </mm:notpresent>
+ <mm:present referid="givenanswer">
+ <mm:node id="answernode" referid="givenanswer" />
+ </mm:present>
+
<jsp:directive.include file="/education/tests/definitions.jsp" />
<mm:node number="$question" id="my_question">
@@ -24,33 +34,33 @@
<c:choose>
<c:when test="${_ eq 2}">
<!-- Save the answer if type_of_score=2, no scoring -->
- <mm:createnode type="givenanswers" id="my_givenanswers">
+ <mm:node referid="answernode" id="my_givenanswers">
<mm:setfield name="text"><mm:write
referid="givenanswer"/></mm:setfield>
<mm:setfield name="score"><mm:write
referid="TESTSCORE_COR"/></mm:setfield>
- </mm:createnode>
+ </mm:node>
</c:when>
<c:when test="${_ eq 0 or fn:length(openanswers) eq 0}">
<!-- Save the answer if type_of_score=0, will be checked by
coach-->
- <mm:createnode type="givenanswers" id="my_givenanswers">
+ <mm:node referid="answernode" id="my_givenanswers">
<mm:setfield name="text"><mm:write
referid="givenanswer"/></mm:setfield>
<mm:setfield name="score"><mm:write
referid="TESTSCORE_TBS"/></mm:setfield>
- </mm:createnode>
+ </mm:node>
</c:when>
<c:otherwise>
<!-- Save the answer if type_of_score=1, will be checked using
example answers -->
<mm:listnodes referid="openanswers">
<mm:field name="text" id="text">
<mm:compare referid="givenanswer" referid2="text">
- <mm:createnode type="givenanswers" id="my_givenanswers">
+ <mm:node referid="answernode" id="my_givenanswers">
<mm:setfield name="text"><mm:write
referid="givenanswer"/></mm:setfield>
<mm:setfield name="score"><mm:write
referid="TESTSCORE_COR"/></mm:setfield>
- </mm:createnode>
+ </mm:node>
</mm:compare>
<mm:compare referid="givenanswer" referid2="text"
inverse="true">
- <mm:createnode type="givenanswers" id="my_givenanswers">
+ <mm:node referid="answernode" id="my_givenanswers">
<mm:setfield name="text"><mm:write
referid="givenanswer"/></mm:setfield>
<mm:setfield name="score"><mm:write
referid="TESTSCORE_WR"/></mm:setfield>
- </mm:createnode>
+ </mm:node>
</mm:compare>
</mm:field>
</mm:listnodes>
@@ -59,9 +69,6 @@
</mm:field>
- <mm:createrelation role="related" source="madetest"
destination="my_givenanswers"/>
- <mm:createrelation role="related" source="question"
destination="my_givenanswers"/>
-
</mm:node>
</mm:cloud>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
