Update of /var/cvs/contributions/didactor2/src/assessment/templates/assessment
In directory james.mmbase.org:/tmp/cvs-serv26569
Modified Files:
closelesson.link.jspx matrix.div.jspx problem.item.jspx
stage3-problems.jspx student.jspx
Log Message:
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/assessment/templates/assessment
Index: closelesson.link.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/closelesson.link.jspx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- closelesson.link.jspx 8 Jan 2009 09:33:28 -0000 1.2
+++ closelesson.link.jspx 8 Jan 2009 10:32:53 -0000 1.3
@@ -10,10 +10,14 @@
- <c:if test="${! empty firstopenlesson}">
+ <c:if test="${! empty lastlesson}">
<mm:node number="$user">
- <mm:function name="canCloseLesson" referids="firstopenles...@lesson">
+ <mm:node referid="lastlesson">
+ <mm:nodeinfo type="gui" />
+ </mm:node>
+ <mm:function name="canCloseLesson"
+ referids="lastles...@lesson">
<c:choose>
<c:when test="${_}">
@@ -24,8 +28,8 @@
<form name="closelessonform" action="${_}" method="post">
<input type="hidden" name="coachmode" value="false" />
- <input type="hidden" name="lesson" value="${firstopenlesson}"
/>
- <di:translate key="assessment.close_and_send_to_coach"
arg0="${firstopenlesson.name}">
+ <input type="hidden" name="lesson" value="${lastlesson}" />
+ <di:translate key="assessment.close_and_send_to_coach"
arg0="${lastlesson.name}">
<input type="submit" class="formbutton" value="${_}" />
</di:translate>
</form>
Index: matrix.div.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/matrix.div.jspx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
Index: problem.item.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/problem.item.jspx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- problem.item.jspx 8 Jan 2009 09:33:28 -0000 1.2
+++ problem.item.jspx 8 Jan 2009 10:32:53 -0000 1.3
@@ -2,6 +2,7 @@
version="2.0"
xmlns:c="http://java.sun.com/jsp/jstl/core";
xmlns:jsp="http://java.sun.com/JSP/Page";
+ xmlns:di="http://www.didactor.nl/ditaglib_1.0";
xmlns:mm-sr="http://www.mmbase.org/tags/mm/searchrelate";
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
>
@@ -10,34 +11,39 @@
<mm:import externid="source" required="true" />
<mm:import externid="confirm" />
<mm:import externid="icondir" />
+
+ <mm:node id="problem">
<mm:fieldlist fields="name,type">
<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:present referid="lastlesson">
+ <mm:relation to="${lastlesson}" role="posrel" notfound="null">
+ <c:if test="${empty _node}">
+ <mm:cloud>
+ <mm:node number="${lastlesson}" id="ll" />
+ <mm:node number="${problem}" id="dest" />
+ <mm:createrelation id="new" source="ll" destination="dest"
role="posrel" commitonclose="true">
+ <!-- default value of how much trouble -->
+ <mm:setfield name="pos">4</mm:setfield>
+ </mm:createrelation>
+ </mm:cloud>
+ </c:if>
</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:listrelationscontainer type="learnobjects" role="posrel">
+ <mm:addnode element="learnobjects" number="${sessionScope.lastlesson}"
/>
+ <mm:listrelations id="relation">
+ <mm:field name="pos" id="pos${relation}">
+ <mm:fieldinfo field="pos${_node}"
datatype="didactor_assessment_troubles" type="input" />
+ <mm:fieldinfo field="pos${_node}"
datatype="didactor_assessment_troubles" type="errors" />
</mm:field>
</mm:listrelations>
</mm:listrelationscontainer>
+ </mm:present>
<mm-sr:delete source="${source}" confirm="${confirm}" icondir="${icondir}" />
-
+ </mm:node>
</jsp:root>
Index: stage3-problems.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/stage3-problems.jspx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- stage3-problems.jspx 8 Jan 2009 09:33:28 -0000 1.2
+++ stage3-problems.jspx 8 Jan 2009 10:32:53 -0000 1.3
@@ -4,13 +4,23 @@
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
xmlns:di="http://www.didactor.nl/ditaglib_1.0";
xmlns:mm-sr="http://www.mmbase.org/tags/mm/searchrelate";
- class="problems">
+ class="problems stage3">
<jsp:output omit-xml-declaration="true" />
<h2><di:translate key="assessment.problems" /></h2>
- <h4>probleem</h4>
- <h4>soort</h4>
- <h4>hoe veel last</h4>
+
+ <div>
+ <mm:node referid="lastlesson">
+ Hoeveel last in <mm:nodeinfo type="gui" />
+ </mm:node>
+ </div>
+
+
+
+ <h4 class="mm_f_name">probleem</h4>
+ <h4 class="mm_f_type">soort</h4>
+ <h4 class="mm_dt_didactor_assessment_troubles">hoe veel last</h4>
+
<mm:node number="${user}">
<mm:treefile
write="false"
Index: student.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/student.jspx,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- student.jspx 8 Jan 2009 09:33:28 -0000 1.28
+++ student.jspx 8 Jan 2009 10:32:53 -0000 1.29
@@ -13,7 +13,7 @@
<ul class="tabs">
<mm:import from="cookie"
externid="didactor_${education}_${user}_maxsequence" id="reached">0</mm:import>
- <c:forEach items="stage1-goals,stage2-problems,stage3-problems" var="s">
+ <c:forEach
items="stage1-goals,stage2-problems,stage3-problems,stage4-problems" var="s">
<mm:context>
<c:set var="settingname" value="opens_${s}" />
@@ -35,6 +35,31 @@
</c:forEach>
</ul>
+
+ <mm:node number="${education}">
+ <mm:relatednodescontainer
+ element="learnblocks"
+ searchdirs="destination"
+ path="posrel,learnblocks${di:setting('assessment',
'relate_learnblocks') ? ',related,components' : ''}">
+ <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">
+ <mm:listrelationscontainer type="learnblocks" role="posrel">
+ <mm:listrelations>
+ <mm:relation from="${learnBlock}" to="${user}" role="classrel">
+ <mm:remove referid="lastlesson" />
+ <mm:node node="learnBlock" id="lastlesson" />
+ </mm:relation>
+ </mm:listrelations>
+ </mm:listrelationscontainer>
+ </mm:relatednodes>
+ </mm:relatednodescontainer>
+ </mm:node>
+ <mm:write session="lastlesson" referid="lastlesson" />
+
+
<di:include page="/assessment/${stage}.jspx" />
<di:include page="/assessment/closelesson.link.jspx" />
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
