Update of /var/cvs/contributions/didactor2/src/assessment/templates/assessment
In directory james.mmbase.org:/tmp/cvs-serv24684
Modified Files:
closelesson.link.jspx evaluate.jspx matrix.div.jspx
problem.item.jspx stage2-problems.jspx stage3-problems.jspx
student.jspx
Added Files:
stage4-problems.jspx
Log Message:
jelle
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/assessment/templates/assessment
stage4-problems.jspx is new
Index: closelesson.link.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/closelesson.link.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- closelesson.link.jspx 7 Jan 2009 17:05:48 -0000 1.1
+++ closelesson.link.jspx 8 Jan 2009 09:33:28 -0000 1.2
@@ -9,6 +9,7 @@
<jsp:output omit-xml-declaration="true" />
+
<c:if test="${! empty firstopenlesson}">
<mm:node number="$user">
Index: evaluate.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/evaluate.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- evaluate.jspx 5 Dec 2008 15:57:23 -0000 1.1
+++ evaluate.jspx 8 Jan 2009 09:33:28 -0000 1.2
@@ -16,8 +16,42 @@
<mm:node referid="problem">
+
<h2><mm:field name="name" /></h2>
+ <div clas="learnblockNames">
+ <h2>Geef per les aan hoeveel last je van dit probleem had</h2>
+ <h4 class="learnblockName">les 1</h4>
+ <h4 class="learnblockName">les 2</h4>
+ <h4 class="learnblockName">les 3</h4>
+ <h4 class="learnblockName">les 4</h4>
+ <h4 class="learnblockName">les 5</h4>
+
+ </div>
+ <div class="problemLearnblock">
+ <mm:listrelationscontainer type="learnblocks" role="posrel">
+ <mm:listrelations id="relation">
+ <mm:field name="pos" id="pos${relation}">
+ <mm:relation from="${learnBlock}" to="${user}" role="classrel">
+ <!--
+ This should make the 'trouble' readonly for already closed
lessons.
+ Sadly doesn't work very nicely becuase explicit datatypes
does not influence gui value.
+ Perhaps a bug.
+ But also a consequence of insisting to use posrel for
something which simply isn't.
+ I hate the people who 'designed' this.
+
+ <mm:fieldinfo field="pos${relation}"
datatype="didactor_assessment_troubles" type="${empty _node ? 'input' :
'guivalue'}" />
+
+ -->
+
+
+ </mm:relation>
+ <mm:fieldinfo field="pos${relation}"
datatype="didactor_assessment_troubles" type="input" />
+ <mm:fieldinfo field="pos${relation}"
datatype="didactor_assessment_troubles" type="errors" />
+ </mm:field>
+ </mm:listrelations>
+ </mm:listrelationscontainer>
+ </div>
<mm:include page="/education/tests/buildtest.jsp"
referids="t...@learnobject" />
</mm:node>
Index: matrix.div.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/matrix.div.jspx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- matrix.div.jspx 2 Jan 2009 09:36:10 -0000 1.13
+++ matrix.div.jspx 8 Jan 2009 09:33:28 -0000 1.14
@@ -24,17 +24,10 @@
<span class="col problem">
<div class="intro">
<mm:field name="name">
- <mm:fieldinfo type="input" />
- <mm:fieldinfo type="errors" />
- </mm:field>
- </div>
- <div class="extra">
- <mm:field name="description">
- <mm:fieldinfo type="guiname" />
- <mm:fieldinfo type="input" />
- <mm:fieldinfo type="errors" />
+
</mm:field>
</div>
+
</span>
<mm:node id="problem" number="${_node}" /> <!-- give current node an id, and
put it in the current cloud -->
@@ -114,8 +107,8 @@
</mm:relation>
- <mm:fieldinfo field="pos${relation}"
datatype="didactor_assessment_troubles" type="input" />
- <mm:fieldinfo field="pos${relation}"
datatype="didactor_assessment_troubles" type="errors" />
+ <mm:fieldinfo field="pos${relation}"
datatype="didactor_assessment_troubles" type="value" />
+
</mm:field>
</mm:listrelations>
</mm:listrelationscontainer>
@@ -128,13 +121,13 @@
</mm:node>
<span class="col">
- <mm-sr:delete source="${source}" icondir="${icondir}" />
+
<jsp:text> </jsp:text>
<mm:present referid="test">
<mm:link referids="test,_n...@problem">
<mm:param name="sub">assessment</mm:param>
<mm:param name="subsub">evaluate</mm:param>
- <a href="${_}">Werk uit ${_node}</a>
+ <a href="${_}">Werk dit probleem uit</a>
</mm:link>
</mm:present>
</span>
Index: problem.item.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/problem.item.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- problem.item.jspx 7 Jan 2009 18:03:54 -0000 1.1
+++ problem.item.jspx 8 Jan 2009 09:33:28 -0000 1.2
@@ -6,6 +6,7 @@
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
>
<jsp:output omit-xml-declaration="true" />
+
<mm:import externid="source" required="true" />
<mm:import externid="confirm" />
<mm:import externid="icondir" />
@@ -13,6 +14,30 @@
<mm:fieldinfo type="input" />
<mm:fieldinfo type="errors" />
</mm:fieldlist>
+
+ <mm:listrelationscontainer type="learnblocks" role="posrel">
+ <mm:listrelations id="relation">
+ <mm:field name="pos" id="pos${relation}">
+ <mm:relation from="${learnBlock}" to="${user}" role="classrel">
+ <!--
+ This should make the 'trouble' readonly for already closed
lessons.
+ Sadly doesn't work very nicely becuase explicit datatypes
does not influence gui value.
+ Perhaps a bug.
+ But also a consequence of insisting to use posrel for
something which simply isn't.
+ I hate the people who 'designed' this.
+
+ <mm:fieldinfo field="pos${relation}"
datatype="didactor_assessment_troubles" type="${empty _node ? 'input' :
'guivalue'}" />
+
+ -->
+
+
+ </mm:relation>
+ <mm:fieldinfo field="pos${relation}"
datatype="didactor_assessment_troubles" type="input" />
+ <mm:fieldinfo field="pos${relation}"
datatype="didactor_assessment_troubles" type="errors" />
+ </mm:field>
+ </mm:listrelations>
+ </mm:listrelationscontainer>
+
<mm-sr:delete source="${source}" confirm="${confirm}" icondir="${icondir}" />
</jsp:root>
Index: stage2-problems.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/stage2-problems.jspx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- stage2-problems.jspx 7 Jan 2009 18:03:54 -0000 1.2
+++ stage2-problems.jspx 8 Jan 2009 09:33:28 -0000 1.3
@@ -15,7 +15,7 @@
page="/mmbase/style/images/" objectlist="${includePath}"
absolute="context">
<mm-sr:relatednodes
icondir="${_}"
- item="/assessment/problem.item.jspx"
+
path="posrel,problems"
orderby="posrel.pos" type="problems">
</mm-sr:relatednodes>
Index: stage3-problems.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/stage3-problems.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- stage3-problems.jspx 7 Jan 2009 17:05:48 -0000 1.1
+++ stage3-problems.jspx 8 Jan 2009 09:33:28 -0000 1.2
@@ -8,69 +8,20 @@
<jsp:output omit-xml-declaration="true" />
<h2><di:translate key="assessment.problems" /></h2>
- <!--
- show the learnblocks
- -->
- <mm:node number="${education}">
- <span class="head problem">&nbsp;</span>
- <mm:relatednodescontainer
path="posrel,learnblocks${di:setting('assessment', 'relate_learnblocks') ?
',related,components' : ''}" searchdirs="destination">
- <mm:sortorder field="posrel.pos" />
- <c:if test="${di:setting('assessment', 'relate_learnblocks')}">
- <mm:addnode element="components" number="component.assessment" />
- </c:if>
-
- <mm:relatednodes id="learnBlock" varStatus="status">
- <!--
- If a relation learnBlock -classrel->user exists, then that means
that this lesson is marked 'closed' (by this module)
- -->
- <mm:relation to="${user}" role="classrel" searchdir="source"
- notfound="null">
- <c:if test="${empty _node and empty firstopenlesson}">
- <mm:node node="learnBlock" id="firstopenlesson" />
- </c:if>
- <span class="head ${empty _node ? '' : 'closed'}" style="width: ${60
/ status.count}%">
- <mm:field name="name" node="learnBlock" />
- </span>
- </mm:relation>
- </mm:relatednodes>
- </mm:relatednodescontainer>
-
- <span class="head delete">&nbsp;</span>
- </mm:node>
-
-
- <!--
- Now the problems, divided per type.
- They can be edited by the user
- -->
- <mm:listnodes orderby="pos" type="problemtypes">
- <div class="inter"><di:translate key="assessment.${_node.key}" /></div>
-
+ <h4>probleem</h4>
+ <h4>soort</h4>
+ <h4>hoe veel last</h4>
+ <mm:node number="${user}">
<mm:treefile
write="false"
page="/mmbase/style/images/" objectlist="${includePath}"
absolute="context">
<mm-sr:relatednodes
- item="/assessment/matrix.div.jspx?sub=${sub}"
icondir="${_}"
- path="related,problems,posrel,people" orderby="posrel.pos"
type="problems">
- <jsp:attribute name="constraints">
- <mm:addnode element="people" number="${user}" />
- </jsp:attribute>
+ item="/assessment/problem.item.jspx"
+ path="posrel,problems"
+ orderby="posrel.pos" type="problems">
</mm-sr:relatednodes>
</mm:treefile>
- </mm:listnodes>
-
- <!--
- Now links to the feed back pages
- -->
- <div>
- <span class="head problem">
- <di:translate key="assessment.feedback_coach" />:
- <mm:link page="/c/shoutbox/index/">
- <a href="${_}" name=""><di:translate key="assessment.messages"/></a>
- </mm:link>
- </span>
-
- </div>
+ </mm:node>
</div>
Index: student.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/student.jspx,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- student.jspx 7 Jan 2009 18:22:16 -0000 1.27
+++ student.jspx 8 Jan 2009 09:33:28 -0000 1.28
@@ -22,6 +22,7 @@
<mm:function id="stage_required" name="sequence" write="false" />
</mm:node>
</c:if>
+
<c:if test="${empty di:setting('assessment', settingname) or reached
ge stage_required}">
<li class="${stage eq s ? 'current' : ''}">
<mm:link referids="s...@stage">
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
