[MMBASE CVS] contributions/didactor2/src/assessment/templates/assessment stage5-editdifficulties.jspx stage5-evaluate.jspx stage5.js.jsp

[Michiel Meeuwissen]

Update of /var/cvs/contributions/didactor2/src/assessment/templates/assessment
In directory james.mmbase.org:/tmp/cvs-serv32362

Modified Files:
        stage5-editdifficulties.jspx stage5-evaluate.jspx 
        stage5.js.jsp 
Log Message:
several details


See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/assessment/templates/assessment


Index: stage5-editdifficulties.jspx
===================================================================
RCS file: 
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/stage5-editdifficulties.jspx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- stage5-editdifficulties.jspx        8 Jan 2009 14:51:03 -0000       1.2
+++ stage5-editdifficulties.jspx        9 Jan 2009 11:46:24 -0000       1.3
@@ -7,20 +7,24 @@
     style="clear: both;"
     >
   <jsp:output omit-xml-declaration="true" />
-  <mm:import externid="problem" />
-  <mm:cloud>
+  <mm:import externid="problem" required="true" />
+  <mm:cloud method="asis">
+
+    <mm:node number="${education}">
+      <mm:nodelistfunction name="lessons">
+        <h4 class="mm_dt_didactor_assessment_troubles"><mm:nodeinfo type="gui" 
/></h4>
+      </mm:nodelistfunction>
     <mm:form id="difficulties">
-      <mm:node number="${problem}">
-        <input type="hidden" name="problem" value="${_node}" />
-        <mm:listrelationscontainer type="learnblocks" role="posrel">
-          <mm:listrelations>
+        <mm:nodelistfunction name="lessons">
+          <mm:relation to="${problem}">
+            <input type="hidden" name="problem" value="${problem}" />
             <mm:field name="pos" id="pos${_node}">
               <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:node>
+          </mm:relation>
+        </mm:nodelistfunction>
     </mm:form>
+    </mm:node>
   </mm:cloud>
 </div>


Index: stage5-evaluate.jspx
===================================================================
RCS file: 
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/stage5-evaluate.jspx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- stage5-evaluate.jspx        9 Jan 2009 10:40:01 -0000       1.9
+++ stage5-evaluate.jspx        9 Jan 2009 11:46:24 -0000       1.10
@@ -13,6 +13,7 @@
   -->
   <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="${_}"> </script>
@@ -20,38 +21,34 @@
 
   <mm:node referid="problem">
 
-               <p><a href="#" 
onclick="history.back(-1);">&amp;lt;&amp;lt;terug naar het overzicht</a></p>
+
+    <mm:link referids="sub?">
+      <mm:param name="stage">stage4-problems</mm:param>
+      <p><a href="${_}">&amp;lt;&amp;lt;terug naar het overzicht</a></p>
+    </mm:link>
 
     <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:node number="${education}">
-        <mm:nodelistfunction name="lessons">
-          <h4 class="mm_dt_didactor_assessment_troubles"><mm:nodeinfo 
type="gui" /></h4>
-        </mm:nodelistfunction>
-      </mm:node>
-
+      <mm:include page="/assessment/stage5-editdifficulties.jspx" />
 
-      <mm:link page="/assessment/stage5.js.jsp">
-        <script type="text/javascript" src="${_}" />
-      </mm:link>
     </div>
 
-
-    <div id="contentFrame">
+    <div id="contentFrame" style="clear: both;">
       <mm:include page="/education/tests/buildtest.jsp"
                   referids="t...@learnobject" />
     </div>
 
+
     <mm:link page="/assessment/stage5.js.jsp">
-      <script type="text/javascript" src="${_}" />
+      <script type="text/javascript" src="${_}">
+        <jsp:text> </jsp:text>
+      </script>
     </mm:link>
 
-
   </mm:node>
 
 


Index: stage5.js.jsp
===================================================================
RCS file: 
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/stage5.js.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs