Update of
/var/cvs/contributions/didactor2/src/education/templates/education/tests
In directory james.mmbase.org:/tmp/cvs-serv24323/tests
Modified Files:
buildtest.jsp buildtestresult.jsp index.jsp rate.jsp
totalscore.jsp viewanswersframe.jsp
Log Message:
cleaning
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/templates/education/tests
Index: buildtest.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/tests/buildtest.jsp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- buildtest.jsp 26 Jun 2008 12:50:21 -0000 1.38
+++ buildtest.jsp 26 Jun 2008 13:56:09 -0000 1.39
@@ -5,7 +5,7 @@
xmlns:c="http://java.sun.com/jsp/jstl/core";
xmlns:fn="http://java.sun.com/jsp/jstl/functions";
>
- <mm:content postprocessor="none" expires="0">
+ <mm:content type="application/xml" postprocessor="reducespace" expires="0">
<mm:cloud rank="didactor user">
<mm:import externid="learnobject" required="true"/>
Index: buildtestresult.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/tests/buildtestresult.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- buildtestresult.jsp 26 Jun 2008 12:50:21 -0000 1.1
+++ buildtestresult.jsp 26 Jun 2008 13:56:09 -0000 1.2
@@ -5,41 +5,49 @@
xmlns:c="http://java.sun.com/jsp/jstl/core";
xmlns:fn="http://java.sun.com/jsp/jstl/functions";
>
- <mm:content postprocessor="none" expires="0">
- <mm:import externid="madetestscore" required="true" />
+ <mm:import externid="madetest" required="true" />
+ <mm:import externid="learnobject" required="true" />
+ <mm:node referid="madetest" id="madetest" />
+
<jsp:directive.include file="/education/tests/definitions.jsp" />
- <mm:cloud rank="didactor user">
- <div class="learnenvironment">
+ <div class="content learnenvironment testresults">
+
<di:title field="name" />
<mm:field id="maychange" name="maychange" write="false"/>
<mm:field id="mayview" name="mayview" write="false"/>
<mm:field id="feedback" name="feedbackpage" write="false"/>
+
<mm:import externid="justposted" />
- <mm:field name="number">
- <mm:compare referid2="justposted" inverse="true">
- <mm:compare referid="madetestscore" referid2="TESTSCORE_TBS">
+ <c:if test="${justposted ne _node.number}">
+
+ <c:choose>
+ <c:when test="${madetest.score eq TESTSCORE_TBS}">
+ <jsp:text><!-- Score is ${madetest.score}, which means that is
still has to be evaluated --></jsp:text>
<p><di:translate key="education.alreadymade_tobescored" /></p>
- </mm:compare>
+ </c:when>
+ <c:otherwise>
+ <jsp:text><!-- Show feedback, score is ${madetest.score}
(required ${_node.requiredscore}) --></jsp:text>
- <mm:compare referid="madetestscore" referid2="TESTSCORE_TBS"
inverse="true">
- <!-- if madestestscore larger or equal than requiredscore -->
- <mm:field id="requiredscore" name="requiredscore" write="false"/>
- <mm:islessthan referid="feedback" value="1">
- <mm:islessthan referid="madetestscore"
referid2="requiredscore" inverse="true">
+ <c:choose>
+ <c:when test="${_node.feedbackpage eq 1}">
+ <di:translate key="education.alreadymade" /> <p/>
+ </c:when>
+ <c:when test="${_node.feedbackpage lt 1}">
+ <c:choose>
+ <c:when test="${madetestscore ge _node.requiredscore }">
<di:translate key="education.alreadymade_success" /><p/>
- </mm:islessthan>
- <mm:islessthan referid="madetestscore"
referid2="requiredscore">
+ </c:when>
+ <c:otherwise>
<di:translate key="education.alreadymade_fail" /><p/>
- </mm:islessthan>
- </mm:islessthan>
+ </c:otherwise>
+ </c:choose>
+ </c:when>
+ </c:choose>
- <mm:compare referid="feedback" value="1">
- <di:translate key="education.alreadymade" /> <p/>
- </mm:compare>
<table>
<tr>
@@ -47,7 +55,7 @@
<td>
<div class="button1">
<mm:treefile
page="/education/tests/viewanswersframe.jsp" objectlist="$includePath"
write="false"
-
referids="$referids,testNo,madetestNo,[EMAIL PROTECTED]"
+ referids="$referids,[EMAIL PROTECTED],[EMAIL
PROTECTED],[EMAIL PROTECTED]"
>
<a href="${_}" onclick="requestContent('${_}');
return false;"><di:translate key="education.view" /></a>
</mm:treefile>
@@ -60,8 +68,10 @@
<div class="button1">
<mm:treefile
page="/education/tests/buildtest.jsp"
objectlist="$includePath" write="false"
- referids="$referids,[EMAIL PROTECTED]">
- <a href="${_}">
+ referids="$referids,learnobject">
+ <a href="${_}"
+ onclick="requestContent('${_}'); return false;"
+ >
<mm:compare referid="feedback"
value="1"><di:translate key="education.again" /></mm:compare>
<mm:compare referid="feedback"
value="0"><di:translate key="education.retry" /></mm:compare>
</a>
@@ -72,19 +82,19 @@
<div class="button1">
<mm:treefile
page="/education/tests/buildtest.jsp"
objectlist="$includePath" write="false"
- referids="$referids,[EMAIL PROTECTED]">
+ referids="$referids,learnobject">
<mm:param name="clearmadetest">true</mm:param>
- <a href="${_}"><di:translate key="education.clear"
/></a>
+ <a href="${_}"
+ onclick="requestContent('${_}'); return false;"
+ ><di:translate key="education.clear" /></a>
</mm:treefile>
</div>
</td>
</mm:compare>
</tr>
</table>
- </mm:compare>
- </mm:compare>
- </mm:field>
+ </c:otherwise>
+ </c:choose>
+ </c:if>
</div>
- </mm:cloud>
- </mm:content>
</jsp:root>
Index: index.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/tests/index.jsp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- index.jsp 26 Jun 2008 12:50:21 -0000 1.33
+++ index.jsp 26 Jun 2008 13:56:09 -0000 1.34
@@ -40,24 +40,23 @@
<mm:constraint field="score" referid="TESTSCORE_INCOMPLETE"
inverse="true"/>
<mm:constraint field="copybooks.number" value="$copybookNo"
/>
<mm:relatednodes>
- <mm:field id="madetestNo" name="number" write="false"/>
- <mm:field id="madetestscore" name="score" write="false"/>
+ <mm:node id="madetest" />
</mm:relatednodes>
</mm:relatednodescontainer>
</mm:present>
<jsp:text><!-- made test no: ${madetestNo} --></jsp:text>
- <mm:present referid="madetestNo">
+ <mm:present referid="madetest">
<!-- Made already, show the result -->
<mm:treeinclude
debug="html"
page="/education/tests/buildtestresult.jsp"
objectlist="$includePath"
- referids="$referids,[EMAIL PROTECTED],madetestscore" />
+ referids="$referids,[EMAIL PROTECTED],madetest" />
</mm:present>
- <mm:present referid="madetestNo" inverse="true">
+ <mm:present referid="madetest" inverse="true">
<!-- Not made already, build the test, and let the user make
it -->
<mm:treeinclude
debug="html"
Index: rate.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/tests/rate.jsp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- rate.jsp 15 Jan 2008 15:45:54 -0000 1.28
+++ rate.jsp 26 Jun 2008 13:56:09 -0000 1.29
@@ -40,7 +40,9 @@
<!-- rate the given answers, and lay (new) relations -->
<mm:import id="ratepage" reset="true">/education/<mm:nodeinfo
type="type"/>/rate<mm:nodeinfo type="type"/>.jsp</mm:import>
+
<mm:treeinclude page="$ratepage" objectlist="$includePath"
referids="$referids,madetest,[EMAIL PROTECTED]" />
+
</mm:listnodes>
<c:choose>
@@ -49,19 +51,20 @@
If "done" pressed then show the feedback
-->
<div>
- <mm:field name="feedbackpage">
- <mm:compare value="0">
<mm:treeinclude page="/education/tests/totalscore.jsp"
objectlist="$includePath"
referids="$referids,madetest,[EMAIL
PROTECTED]" />
+
+ <mm:field name="feedbackpage" write="false">
+ <c:choose>
+ <c:when test="${_ eq 0}">
<mm:treeinclude page="/education/tests/feedback.jsp"
objectlist="$includePath"
referids="$referids,madetest,[EMAIL
PROTECTED]" />
- </mm:compare>
-
- <mm:compare value="0" inverse="true">
+ </c:when>
+ <c:otherwise>
<mm:treeinclude page="/education/tests/viewanswersframe.jsp"
objectlist="$includePath"
referids="$referids,[EMAIL PROTECTED],[EMAIL
PROTECTED],[EMAIL PROTECTED]" />
- </mm:compare>
-
+ </c:otherwise>
+ </c:choose>
</mm:field>
</div>
</c:when>
Index: totalscore.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/tests/totalscore.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- totalscore.jsp 31 Jul 2007 15:36:06 -0000 1.8
+++ totalscore.jsp 26 Jun 2008 13:56:09 -0000 1.9
@@ -1,35 +1,48 @@
-<[EMAIL PROTECTED] uri="http://www.mmbase.org/mmbase-taglib-2.0"; prefix="mm"%>
-<[EMAIL PROTECTED] uri="http://www.didactor.nl/ditaglib_1.0"; prefix="di" %>
-<mm:content postprocessor="reducespace" expires="0">
- <mm:cloud method="asis">
- <[EMAIL PROTECTED] file="/education/tests/definitions.jsp" %>
+<jsp:root
+ version="2.0"
+ xmlns:jsp="http://java.sun.com/JSP/Page";
+ xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
+ xmlns:c="http://java.sun.com/jsp/jstl/core";
+ xmlns:di="http://www.didactor.nl/ditaglib_1.0"; >
+
+ <jsp:directive.include file="/education/tests/definitions.jsp" />
+
+ <!--
+ now recalculate the score of the made test, using the score in the
given answers objects
+ TODO, this could typically be implemented in eventhandlers or so. JSP
is not a very robust location.
+ -->
<mm:import externid="tests" required="true"/>
<mm:import externid="madetest" required="true"/>
- <%-- count score of questions --%>
- <% int points= 0; %>
+ <jsp:scriptlet>
+ int points= 0;
+ </jsp:scriptlet>
+
<mm:import id="totalscore"><mm:write
referid="TESTSCORE_INCOMPLETE"/></mm:import>
<mm:node referid="madetest">
<mm:relatednodes type="givenanswers">
- <mm:field name="score" id="score" write="false"/>
- <mm:compare referid="score" value="1">
- <% points++; %>
- </mm:compare>
- <mm:compare referid="score" referid2="TESTSCORE_TBS">
+ <mm:field name="score" write="false" vartype="integer" jspvar="score">
+ <c:choose>
+ <c:when test="${_ ge 1}">
+ <jsp:scriptlet>points += score;</jsp:scriptlet>
+ </c:when>
+ <c:when test="${_ eq TESTSCORE_TBS}">
+ <mm:log>SCORE is sTBS, resetting complete score</mm:log>
<mm:remove referid="totalscore"/>
<mm:import id="totalscore"><mm:write
referid="TESTSCORE_TBS"/></mm:import>
- </mm:compare>
- <mm:remove referid="score"/>
+ </c:when>
+ </c:choose>
+ </mm:field>
</mm:relatednodes>
+
+
<mm:compare referid="totalscore" referid2="TESTSCORE_TBS">
<mm:setfield name="score"><mm:write
referid="TESTSCORE_TBS"/></mm:setfield>
</mm:compare>
<mm:compare referid="totalscore" referid2="TESTSCORE_TBS" inverse="true">
- <mm:setfield name="score"><%=points%></mm:setfield>
+ <mm:setfield
name="score"><jsp:expression>points</jsp:expression></mm:setfield>
</mm:compare>
</mm:node>
-
- </mm:cloud>
-</mm:content>
+</jsp:root>
Index: viewanswersframe.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/tests/viewanswersframe.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- viewanswersframe.jsp 9 Aug 2007 13:22:55 -0000 1.10
+++ viewanswersframe.jsp 26 Jun 2008 13:56:09 -0000 1.11
@@ -1,16 +1,24 @@
-<[EMAIL PROTECTED] contentType="application/xml;charset=UTF-8"
-%><[EMAIL PROTECTED] uri="http://www.mmbase.org/mmbase-taglib-2.0"; prefix="mm"
-%><[EMAIL PROTECTED] uri="http://www.didactor.nl/ditaglib_1.0"; prefix="di"
-%><mm:content type="application/xml" postprocessor="reducespace" expires="0">
-<mm:cloud rank="didactor user">
+<jsp:root
+ xmlns:jsp="http://java.sun.com/JSP/Page"; version="2.0"
+ xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
+ xmlns:di="http://www.didactor.nl/ditaglib_1.0";
+ xmlns:c="http://java.sun.com/jsp/jstl/core";
+ xmlns:fn="http://java.sun.com/jsp/jstl/functions";
+ >
+ <mm:content type="application/xml" postprocessor="reducespace" expires="0">
+ <mm:cloud rank="didactor user">
<mm:import externid="testNo" required="true"/>
<mm:import externid="madetestNo" required="true"/>
<mm:import externid="userNo" required="true"/>
<div class="learnenvironment">
- <mm:treeinclude debug="xml" page="/education/tests/totalscore.jsp"
objectlist="$includePath" referids="$referids,[EMAIL PROTECTED],[EMAIL
PROTECTED]" />
- <mm:treeinclude debug="xml" page="/education/tests/feedback.jsp"
objectlist="$includePath" referids="$referids,[EMAIL PROTECTED],[EMAIL
PROTECTED]" />
+ <mm:treeinclude debug="xml" page="/education/tests/totalscore.jsp"
+ objectlist="$includePath" referids="$referids,[EMAIL
PROTECTED],[EMAIL PROTECTED]" />
+ <mm:treeinclude debug="xml" page="/education/tests/feedback.jsp"
+ objectlist="$includePath" referids="$referids,[EMAIL
PROTECTED],[EMAIL PROTECTED]" />
<hr/>
- <mm:treeinclude debug="xml" page="/education/tests/viewanswers.jsp"
objectlist="$includePath" referids="$referids,testNo,madetestNo,userNo" />
+ <mm:treeinclude debug="xml" page="/education/tests/viewanswers.jsp"
+ objectlist="$includePath"
referids="$referids,testNo,madetestNo,userNo" />
</div>
-</mm:cloud>
-</mm:content>
+ </mm:cloud>
+ </mm:content>
+</jsp:root>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
