Author: michiel
Date: 2010-05-26 12:11:50 +0200 (Wed, 26 May 2010)
New Revision: 42273
Modified:
didactor/trunk/components/assessment/src/main/webapp/assessment/assessment_coach_overview.jspx
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-coach.jspx
didactor/trunk/components/assessment/src/main/webapp/assessment/stage2-evaluate.jspx
Log:
Modified:
didactor/trunk/components/assessment/src/main/webapp/assessment/assessment_coach_overview.jspx
===================================================================
---
didactor/trunk/components/assessment/src/main/webapp/assessment/assessment_coach_overview.jspx
2010-05-26 08:30:40 UTC (rev 42272)
+++
didactor/trunk/components/assessment/src/main/webapp/assessment/assessment_coach_overview.jspx
2010-05-26 10:11:50 UTC (rev 42273)
@@ -62,7 +62,7 @@
<tr class="toggle_div${class}" id="toggle_div${class}_${_node}">
<td class="listItem">
<mm:node>
- <mm:link referids="sub?">
+ <mm:link referids="sub?,class">
<mm:param name="subsub">coach_student_overview</mm:param>
<mm:param name="student_id">${_node}</mm:param>
<a href="${_}"><mm:field name="firstname"/></a>
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 08:30:40 UTC (rev 42272)
+++
didactor/trunk/components/assessment/src/main/webapp/assessment/coach_student_overview.jspx
2010-05-26 10:11:50 UTC (rev 42273)
@@ -13,8 +13,9 @@
Now the problems, divided per type.
-->
<di:hasrole role="teacher">
- <mm:import externid="student_id" from="parameters" />
- <mm:link page="/homework/" referids="sub?" >
+ <mm:import externid="student_id" from="parameters" required="true" />
+ <mm:import externid="class" from="parameters" required="true" />
+ <mm:link page="/homework/" referids="sub?,class" >
<a href="${_}">&lt; terug naar studentenoverzicht</a>
</mm:link>
@@ -78,7 +79,7 @@
<tr class="problemItem"><td colspan="7">--</td></tr>
</c:if>
<mm:relatednodes>
- <mm:include page="/assessment/matrix.div.coach.jspx"
referids="sub?,subsub?,stage?,_n...@source">
+ <mm:include page="/assessment/matrix.div.coach.jspx"
referids="sub?,subsub?,stage?,_n...@source,class">
<mm:param
name="student_id">${student_id}</mm:param>
</mm:include>
<tr><td colspan="7"><jsp:text> </jsp:text></td></tr>
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 08:30:40 UTC (rev 42272)
+++
didactor/trunk/components/assessment/src/main/webapp/assessment/matrix.div.coach.jspx
2010-05-26 10:11:50 UTC (rev 42273)
@@ -12,10 +12,9 @@
<di:hasrole role="teacher">
<mm:import externid="source" required="true" />
+ <mm:import externid="class" required="true" />
<mm:import externid="icondir" />
<mm:import externid="student_id" required="true"/>
-
-
<!-- Display the problem itself -->
<tr class="problemItem">
<td class="problemName"><mm:field name="name" /> </td>
@@ -56,7 +55,6 @@
</mm:createrelation>
</mm:context>
</mm:cloud>
-
</c:if>
</mm:relation>
</mm:node>
@@ -91,21 +89,15 @@
<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>
<mm:present referid="test">
- <di:copybook student="${student_id}">
- <mm:relatednodescontainer path="madetests,tests" element="madetests"
id="q">
- <mm:constraint field="tests.number" value="${test}" />
- <mm:sortorder field="number" direction="down" />
- <mm:relatednodes max="1">
- <mm:node id="madeTest" />
- </mm:relatednodes>
- </mm:relatednodescontainer>
- </di:copybook>
<td colspan="${fn:length(learnBlock) - blockCount}"
class="learnblockItems" align="right">
<c:choose>
<c:when test="${! empty madeTest}">
- <mm:link
referids="test,_n...@problem,student_id,sub?,madet...@madetestno">
+ <mm:link
referids="test,_n...@problem,student_id,sub?,madet...@madetestno,class">
<mm:param name="subsub">stage2-evaluate-coach</mm:param>
<a href="${_}">bekijk uitwerking</a>
</mm:link>
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 08:30:40 UTC (rev 42272)
+++
didactor/trunk/components/assessment/src/main/webapp/assessment/stage2-evaluate-coach.jspx
2010-05-26 10:11:50 UTC (rev 42273)
@@ -13,6 +13,7 @@
-->
<mm:import externid="problem" required="true" />
<mm:import externid="test" required="true" />
+ <mm:import externid="class" required="true" />
<mm:import externid="sub" />
<mm:import externid="student_id" required="true"/>
@@ -31,7 +32,7 @@
</mm:link>
</p>
<p>
- <mm:link page="/homework/" referids="sub">
+ <mm:link page="/homework/" referids="sub,class">
<mm:param name="subsub">coach_student_overview</mm:param>
<mm:param name="student_id">${student_id}</mm:param>
<a href="${_}">&lt; terug naar probleemlijst van <mm:write
referid="studentname" /></a>
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 08:30:40 UTC (rev 42272)
+++
didactor/trunk/components/assessment/src/main/webapp/assessment/stage2-evaluate.jspx
2010-05-26 10:11:50 UTC (rev 42273)
@@ -64,6 +64,8 @@
</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
