Author: michiel
Date: 2010-03-17 14:06:37 +0100 (Wed, 17 Mar 2010)
New Revision: 41465
Modified:
didactor/trunk/components/assessment/src/main/webapp/assessment/matrix.div.jspx
didactor/trunk/components/assessment/src/main/webapp/assessment/problem.item.jspx
didactor/trunk/components/assessment/src/main/webapp/assessment/stage2-evaluate.jspx
Log:
details
Modified:
didactor/trunk/components/assessment/src/main/webapp/assessment/matrix.div.jspx
===================================================================
---
didactor/trunk/components/assessment/src/main/webapp/assessment/matrix.div.jspx
2010-03-17 12:59:25 UTC (rev 41464)
+++
didactor/trunk/components/assessment/src/main/webapp/assessment/matrix.div.jspx
2010-03-17 13:06:37 UTC (rev 41465)
@@ -69,7 +69,8 @@
<mm:listrelationscontainer type="problems" role="posrel">
<mm:addnode element="problems" number="${problem}" />
-
+ <mm:sortorder field="number" />
+ <mm:maxnumber value="1" />
<mm:listrelations id="relation">
<mm:field name="pos" write="false">
<!-- See MMB-1770 -->
Modified:
didactor/trunk/components/assessment/src/main/webapp/assessment/problem.item.jspx
===================================================================
---
didactor/trunk/components/assessment/src/main/webapp/assessment/problem.item.jspx
2010-03-17 12:59:25 UTC (rev 41464)
+++
didactor/trunk/components/assessment/src/main/webapp/assessment/problem.item.jspx
2010-03-17 13:06:37 UTC (rev 41465)
@@ -52,7 +52,7 @@
</mm:listrelationscontainer>
</mm:isnotempty>
<mm:isempty referid="currentlesson">
- <div class="selectTroublesSpacer">&nbsp;</div>
+ <div class="selectTroublesSpacer"><jsp:text> </jsp:text></div>
</mm:isempty>
</mm:present>
</div>
Modified:
didactor/trunk/components/assessment/src/main/webapp/assessment/stage2-evaluate.jspx
===================================================================
---
didactor/trunk/components/assessment/src/main/webapp/assessment/stage2-evaluate.jspx
2010-03-17 12:59:25 UTC (rev 41464)
+++
didactor/trunk/components/assessment/src/main/webapp/assessment/stage2-evaluate.jspx
2010-03-17 13:06:37 UTC (rev 41465)
@@ -5,92 +5,86 @@
xmlns:di="http://www.didactor.nl/ditaglib_1.0";
xmlns:mm-sr="http://www.mmbase.org/tags/mm/searchrelate";>
<jsp:output omit-xml-declaration="true" />
-<div class="problems_evaluate">
-<div class="problems stage5">
- <!--
+ <div class="problems_evaluate">
+ <div class="problems stage5">
- xmlns:mm-sr="urn:jsptagdir:/WEB-INF/tags/mm/searchrelate/"
+ <mm:import externid="problem" required="true" />
+ <mm:import externid="test" required="true" />
+ <mm:import externid="sub" />
- -->
- <mm:import externid="problem" required="true" />
- <mm:import externid="test" required="true" />
- <mm:import externid="sub" />
+ <mm:link page="/content/js/open.jsp">
+ <script type="text/javascript" src="${_}"><jsp:text>
</jsp:text>/script>
+ </mm:link>
- <mm:link page="/content/js/open.jsp">
- <script type="text/javascript" src="${_}"><!-- --></script>
- </mm:link>
+ <mm:node referid="problem">
- <mm:node referid="problem">
-
- <h2>Probleem:</h2>
- <h4><mm:field name="name" /></h4>
+ <h2>Probleem:</h2>
+ <h4><mm:field name="name" /></h4>
- <div class="problemImpact">
- <h2>Wijzig eventueel per les hoeveel last je van dit probleem had</h2>
-
- <mm:include page="/assessment/stage2-editdifficulties.jspx" />
+ <div class="problemImpact">
+ <h2>Wijzig eventueel per les hoeveel last je van dit probleem
had</h2>
- </div>
+ <mm:include page="/assessment/stage2-editdifficulties.jspx" />
- <div id="problemEvaluateTest" class="problem">
-
- <mm:node referid="test">
- <di:copybook><mm:node id="copybookNo" /></di:copybook>
- <mm:relatednodescontainer
path="madetests,copybooks" element="madetests">
- <mm:constraint field="copybooks.number" referid="copybookNo"/>
- <mm:relatednodes>
- <mm:field name="number" jspvar="this_madetest" vartype="String"
write="false">
- <mm:related path="related,problems"
constraints="problems.number=$problem">
- <mm:import id="madetest"
reset="true">${this_madetest}</mm:import>
-
-
- </mm:related>
- </mm:field>
- </mm:relatednodes>
- </mm:relatednodescontainer>
+ </div>
- <mm:notpresent referid="madetest">
- <mm:createnode type="madetests" id="madetest">
- <mm:setfield name="date"><mm:time time="now"/></mm:setfield>
- <mm:setfield name="testpath"></mm:setfield>
- <mm:setfield name="score">-4</mm:setfield>
- </mm:createnode>
- <mm:node number="${test}" id="this_test"/>
- <mm:createrelation role="related" source="this_test"
destination="madetest"/>
- <mm:createrelation role="related" source="copybookNo"
destination="madetest"/>
- <mm:node number="$problem" notfound="skip">
- <mm:createrelation role="related" source="problem"
destination="madetest"/>
- </mm:node>
- <mm:remove referid="this_test"/>
- <mm:remove referid="copybookNo"/>
- </mm:notpresent>
-
- </mm:node>
+ <div id="problemEvaluateTest" class="problem">
-
- <mm:treeinclude page="/assessment/stage2-evaluate-buildtest.jspx"
- referids="t...@learnobject,madetest"
objectlist="$includePath"/>
-
-
- </div>
-
- <mm:link page="/assessment/stage5.js.jsp">
- <script type="text/javascript" src="${_}">
- <jsp:text> </jsp:text>
- </script>
- </mm:link>
+ <mm:node referid="test">
+ <di:copybook><mm:node id="copybookNo" /></di:copybook>
+ <mm:relatednodescontainer path="madetests,copybooks"
element="madetests">
+ <mm:constraint field="copybooks.number" referid="copybookNo"/>
+ <mm:relatednodes>
+ <mm:field name="number" jspvar="this_madetest"
vartype="String" write="false">
+ <mm:related path="related,problems"
constraints="problems.number=$problem"> <!-- WTF WTF WTF -->
+ <mm:import id="madetest"
reset="true">${this_madetest}</mm:import>
+ </mm:related>
+ </mm:field>
+ </mm:relatednodes>
+ </mm:relatednodescontainer>
- </mm:node>
-</div>
+ <mm:notpresent referid="madetest">
+ <mm:createnode type="madetests" id="madetest">
+ <mm:setfield name="date"><mm:time time="now"/></mm:setfield>
+ <mm:setfield name="testpath"></mm:setfield>
+ <mm:setfield name="score">-4</mm:setfield>
+ </mm:createnode>
+ <mm:node number="${test}" id="this_test"/>
+ <mm:createrelation role="related" source="this_test"
destination="madetest"/>
+ <mm:createrelation role="related" source="copybookNo"
destination="madetest"/>
+ <mm:node number="$problem" notfound="skip">
+ <mm:createrelation role="related" source="problem"
destination="madetest"/>
+ </mm:node>
+ <mm:remove referid="this_test"/>
+ <mm:remove referid="copybookNo"/>
+ </mm:notpresent>
- <div class="submitItems">
- <a href="#" class="formActionLinks"
onclick="window.location.reload()">opslaan</a><jsp:text>&nbsp;|&nbsp;</jsp:text>
- <mm:link page="/homework/">
- <mm:param name="sub">assessment_overview</mm:param>
- <a href="#" class="formActionLinks"
onclick="window.location='${_}'">terug naar problemen aanpakken</a>
- </mm:link>
- </div>
-</div>
+ </mm:node>
+
+
+ <mm:treeinclude page="/assessment/stage2-evaluate-buildtest.jspx"
+ referids="t...@learnobject,madetest"
objectlist="$includePath"/>
+
+
+ </div>
+
+ <mm:link page="/assessment/stage5.js.jsp">
+ <script type="text/javascript" src="${_}">
+ <jsp:text> </jsp:text>
+ </script>
+ </mm:link>
+
+ </mm:node>
+ </div>
+
+ <div class="submitItems">
+ <a href="#" class="formActionLinks"
onclick="window.location.reload()">opslaan</a><jsp:text>&nbsp;|&nbsp;</jsp:text>
+ <mm:link page="/homework/">
+ <mm:param name="sub">assessment_overview</mm:param>
+ <a href="#" class="formActionLinks"
onclick="window.location='${_}'">terug naar problemen aanpakken</a>
+ </mm:link>
+ </div>
+ </div>
</jsp:root>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
