Author: michiel
Date: 2010-05-26 18:21:56 +0200 (Wed, 26 May 2010)
New Revision: 42285
Modified:
didactor/trunk/components/assessment/src/main/webapp/assessment/coach_student_overview.jspx
didactor/trunk/components/assessment/src/main/webapp/assessment/matrix.div.coach.jspx
didactor/trunk/components/assessment/src/main/webapp/assessment/stage2-evaluate-buildtest.jspx
didactor/trunk/components/assessment/src/main/webapp/assessment/stage2-evaluate-coach.jspx
didactor/trunk/components/assessment/src/main/webapp/assessment/stage2-evaluate.jspx
Log:
Modified:
didactor/trunk/components/assessment/src/main/webapp/assessment/coach_student_overview.jspx
===================================================================
---
didactor/trunk/components/assessment/src/main/webapp/assessment/coach_student_overview.jspx
2010-05-26 14:31:55 UTC (rev 42284)
+++
didactor/trunk/components/assessment/src/main/webapp/assessment/coach_student_overview.jspx
2010-05-26 16:21:56 UTC (rev 42285)
@@ -52,12 +52,12 @@
</div>
<table>
+ <mm:node number="${class}">
+ <mm:node element="education">
+ <mm:import id="blocknames" escape="text/plain">
+ <!-- cache the block names, because they are repeated for every
problem type -->
- <mm:node number="${education}">
- <mm:import id="blocknames" escape="text/plain">
- <!-- cache the block names, because they are repeated for every
problem type -->
-
- <mm:nodelistfunction name="lessons" id="learnBlock">
+ <mm:nodelistfunction name="lessons" id="learnBlock">
<!--
If a relation learnBlock -classrel->user exists, then that
means that this lesson is marked 'closed' (by this module)
-->
@@ -66,11 +66,12 @@
<mm:field name="name" node="learnBlock" />
</td>
</mm:relation>
- </mm:nodelistfunction>
- <td><jsp:text> </jsp:text></td>
+ </mm:nodelistfunction>
+ <td><jsp:text> </jsp:text></td>
- </mm:import>
- </mm:node>
+ </mm:import>
+ </mm:node>
+ </mm:node>
<mm:listnodes orderby="pos" type="problemtypes">
Modified:
didactor/trunk/components/assessment/src/main/webapp/assessment/matrix.div.coach.jspx
===================================================================
---
didactor/trunk/components/assessment/src/main/webapp/assessment/matrix.div.coach.jspx
2010-05-26 14:31:55 UTC (rev 42284)
+++
didactor/trunk/components/assessment/src/main/webapp/assessment/matrix.div.coach.jspx
2010-05-26 16:21:56 UTC (rev 42285)
@@ -25,17 +25,18 @@
<c:set var="blockCount" value="0" />
<!-- And, per lesson, how much trouble it gave -->
- <mm:node number="${education}">
- <mm:nodelistfunction name="lessons" id="learnBlock">
- <!--
- Create the relation problem-posrel->learnBlock if that does not
exist yet. The
- 'position' field is abused to indicate how much trouble the
problem gave after this
- lesson. Really, there should not have been used 'posrel' here.
Because _pos_rel is of
- course for _position_, and is not some generic integer which can
be used for whatever one
- likes.
- Only for closed lessons, and the first open one.
- _I_ did not come up with this.
- -->
+ <mm:node number="${class}">
+ <mm:node element="education">
+ <mm:nodelistfunction name="lessons" id="learnBlock">
+ <!--
+ Create the relation problem-posrel->learnBlock if that does
not exist yet. The
+ 'position' field is abused to indicate how much trouble the
problem gave after this
+ lesson. Really, there should not have been used 'posrel'
here. Because _pos_rel is of
+ course for _position_, and is not some generic integer which
can be used for whatever one
+ likes.
+ Only for closed lessons, and the first open one.
+ _I_ did not come up with this.
+ -->
<mm:relation to="${student_id}" notfound="null">
<c:if test="${! empty _node or empty firstopenlesson}">
<c:if test="${empty _node}">
@@ -78,8 +79,8 @@
</mm:listrelationscontainer>
</mm:nodelistfunction>
+ </mm:node>
</mm:node>
-
<mm:import externid="stage" />
<mm:import externid="sub" />
<mm:import externid="subsub" />
@@ -89,11 +90,28 @@
<mm:node id="test" />
</mm:relatednodes>
- <mm:relatednodes path="madetests,givenanswers" element="madetests"
max="1" orderby="number" directions="down">
- <mm:node id="madeTest" />
- </mm:relatednodes>
+ <di:copybook student="${student_id}" classNumber="${class}"><mm:node
id="copybook" /></di:copybook>
+
<mm:present referid="test">
+ <!-- following code is like in stage2-evaluate.jspx (should this be
generalized) -->
+ <mm:node referid="test">
+ <mm:relatednodescontainer path="madetests,copybooks"
element="madetests">
+ <mm:addnode element="copybooks" number="${copybook}"/>
+ <mm:sortorder field="number" />
+ <mm:relatednodes id="this_madetest">
+ <mm:relatednodescontainer role="related" type="problems">
+ <mm:addnode number="${problem}" />
+ <mm:relatednodes>
+ <mm:import id="madeTest"
reset="true">${this_madetest}</mm:import>
+ </mm:relatednodes>
+ </mm:relatednodescontainer>
+ </mm:relatednodes>
+ </mm:relatednodescontainer>
+ </mm:node>
+
+
+
<td colspan="${fn:length(learnBlock) - blockCount}"
class="learnblockItems" align="right">
<c:choose>
<c:when test="${! empty madeTest}">
Modified:
didactor/trunk/components/assessment/src/main/webapp/assessment/stage2-evaluate-buildtest.jspx
===================================================================
---
didactor/trunk/components/assessment/src/main/webapp/assessment/stage2-evaluate-buildtest.jspx
2010-05-26 14:31:55 UTC (rev 42284)
+++
didactor/trunk/components/assessment/src/main/webapp/assessment/stage2-evaluate-buildtest.jspx
2010-05-26 16:21:56 UTC (rev 42285)
@@ -18,7 +18,6 @@
<mm:node id="learnobject" referid="learnobject" />
<di:copybook><mm:node id="copybookNo" /></di:copybook>
-
<div class="content learnenvironment tests">
<!-- Take care: form name is used in JavaScript of the specific
question jsp pages! -->
<mm:treefile id="post" page="/assessment/stage2-evaluate-save.jspx"
objectlist="$includePath" referids="$referids,learnobject,madetest"
write="false"/>
Modified:
didactor/trunk/components/assessment/src/main/webapp/assessment/stage2-evaluate-coach.jspx
===================================================================
---
didactor/trunk/components/assessment/src/main/webapp/assessment/stage2-evaluate-coach.jspx
2010-05-26 14:31:55 UTC (rev 42284)
+++
didactor/trunk/components/assessment/src/main/webapp/assessment/stage2-evaluate-coach.jspx
2010-05-26 16:21:56 UTC (rev 42285)
@@ -23,6 +23,17 @@
<h3><mm:node number="${student_id}"><mm:field id="studentname"
name="firstname"/></mm:node></h3>
+ <p>
+ <jsp:text>Voor de klas</jsp:text>
+ <mm:node number="${class}">
+ <mm:field name="name" />
+ <jsp:text> (</jsp:text>
+ <mm:node element="education"><mm:field name="name" /></mm:node>
+ <jsp:text>).</jsp:text>
+ </mm:node>
+ </p>
+
+
<mm:node referid="problem">
<h4><mm:field name="name" /></h4>
<p>
Modified:
didactor/trunk/components/assessment/src/main/webapp/assessment/stage2-evaluate.jspx
===================================================================
---
didactor/trunk/components/assessment/src/main/webapp/assessment/stage2-evaluate.jspx
2010-05-26 14:31:55 UTC (rev 42284)
+++
didactor/trunk/components/assessment/src/main/webapp/assessment/stage2-evaluate.jspx
2010-05-26 16:21:56 UTC (rev 42285)
@@ -36,6 +36,7 @@
<di:copybook><mm:node id="copybookNo" /></di:copybook>
<mm:relatednodescontainer path="madetests,copybooks"
element="madetests">
<mm:addnode element="copybooks" number="${copybookNo}"/>
+ <mm:sortorder field="number" />
<mm:relatednodes id="this_madetest">
<mm:relatednodescontainer role="related" type="problems">
<mm:addnode number="${problem}" />
@@ -45,7 +46,6 @@
</mm:relatednodescontainer>
</mm:relatednodes>
</mm:relatednodescontainer>
-
<mm:notpresent referid="madetest">
<mm:createnode type="madetests" id="madetest">
<mm:setfield name="date"><mm:time time="now"/></mm:setfield>
@@ -65,7 +65,6 @@
</mm:node>
- MADETEST: ${madetest}
<mm:treeinclude page="/assessment/stage2-evaluate-buildtest.jspx"
referids="t...@learnobject,madetest"
objectlist="$includePath"/>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
