Update of /var/cvs/contributions/didactor2/src/assessment/templates/assessment
In directory james.mmbase.org:/tmp/cvs-serv4538
Modified Files:
coach.jspx matrix.div.jspx student.jspx
Added Files:
evaluate.jspx
Removed Files:
evaluationtest.jspf
Log Message:
trying to get this 'evuluation' stuff back again.
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/assessment/templates/assessment
evaluate.jspx is new
Index: coach.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/coach.jspx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- coach.jspx 22 Oct 2008 14:26:58 -0000 1.11
+++ coach.jspx 5 Dec 2008 15:57:22 -0000 1.12
@@ -63,57 +63,12 @@
</td>
<mm:relatednodes referid="learnblocks" id="learnblock">
<td class="listItem">
- <mm:relation role="classrel" to="${student}">
- <mm:relatednodes type="popfeedback">
- <mm:node id="feedback" />
- </mm:relatednodes>
- </mm:relation>
-
- <c:choose>
- <c:when test="${empty feedback}">
- &nbsp;
- </c:when>
- <c:otherwise>
- <mm:treefile
- page="/assessment/feedback.jspx"
objectlist="$includePath"
- referids="$referids,[EMAIL PROTECTED]"
- write="false"
- >
- <mm:param name="coachmode" value="true" />
- <a href="${_}">
- <di:img src="${feedback.status ge 0 ?
'/assessment/gfx/todevelop.gif' : '/assessment/gfx/developed.gif'}"
- title="assessment.goto_feedback" />
- </a>
- </mm:treefile>
- <mm:remove referid="feedback" />
- </c:otherwise>
- </c:choose>
<mm:node number="$student">
<di:copybook>
<mm:node id="copybookNo" />
</di:copybook>
</mm:node>
-
- <mm:node number="${assessment_evaluationtest}"
notfound="skip">
- <!-- get madetest -->
- <mm:relatednodescontainer path="madetests,copybooks"
element="madetests">
-
- <mm:relatednodes>
- <mm:treefile page="/assessment/showtest.jsp"
- write="false"
- objectlist="$includePath"
referids="$referids">
- <mm:param name="test"><mm:write
referid="assessment_evaluationtest" /></mm:param>
- <mm:param name="madetest"><mm:field
name="number" /></mm:param>
- <mm:param name="coachmode">true</mm:param>
- <a href="${_}">
- <di:img src="assessment/gfx/present.gif"
- title="assessment.view_evaluationtest"
/>
- </a>
- </mm:treefile>
- </mm:relatednodes>
- </mm:relatednodescontainer>
- </mm:node>
<mm:node number="$student">
<mm:relatednodescontainer type="shouts">
<mm:constraint field="reference"
value="${learnblock}" />
Index: matrix.div.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/matrix.div.jspx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- matrix.div.jspx 22 Oct 2008 14:04:46 -0000 1.11
+++ matrix.div.jspx 5 Dec 2008 15:57:23 -0000 1.12
@@ -10,6 +10,11 @@
-->
+ <mm:relatednodes max="1" path="problemtypes,tests" element="tests">
+
+ <mm:node id="test" />
+ </mm:relatednodes>
+
<mm:import externid="source" required="true" />
<mm:import externid="icondir" />
@@ -124,5 +129,13 @@
<span class="col">
<mm-sr:delete source="${source}" icondir="${icondir}" />
+
+ <mm:present referid="test">
+ <mm:link referids="test,[EMAIL PROTECTED]">
+ <mm:param name="sub">assessment</mm:param>
+ <mm:param name="subsub">evaluate</mm:param>
+ <a href="${_}">Werk uit ${_node}</a>
+ </mm:link>
+ </mm:present>
</span>
</jsp:root>
Index: student.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/student.jspx,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- student.jspx 4 Dec 2008 16:34:28 -0000 1.23
+++ student.jspx 5 Dec 2008 15:57:23 -0000 1.24
@@ -73,7 +73,7 @@
write="false"
page="/mmbase/style/images/" objectlist="${includePath}"
absolute="context">
<mm-sr:relatednodes
- item="/assessment/matrix.div.jspx"
+ item="/assessment/matrix.div.jspx?sub=${sub}"
icondir="${_}"
path="related,problems,posrel,people" orderby="posrel.pos"
type="problems">
<jsp:attribute name="constraints">
@@ -110,9 +110,6 @@
<mm:function name="canCloseLesson" referids="[EMAIL PROTECTED]">
<c:choose>
<c:when test="${_}">
- <!--
- <jsp:directive.include file="evaluationtest.jspf" />
- -->
<mm:treefile page="/assessment/closelesson.jsp"
objectlist="$includePath"
@@ -126,12 +123,6 @@
<input type="submit" class="formbutton" value="${_}" />
</di:translate>
</form>
-
- <!--
- <mm:node number="$assessment_evaluationtest"
notfound="skip">
-
- </mm:node>
- -->
</mm:treefile>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
