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

Modified Files:
        feedback.jspx 
Log Message:



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


Index: feedback.jspx
===================================================================
RCS file: 
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/feedback.jspx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- feedback.jspx       1 Aug 2008 09:02:46 -0000       1.2
+++ feedback.jspx       1 Aug 2008 14:33:28 -0000       1.3
@@ -12,7 +12,6 @@
 
     <mm:import externid="feedback_n" required="true" />
     <mm:import externid="student" required="true" />
-    <mm:import externid="assessment_evaluationtest" />
     <mm:import externid="coachmode" />
 
     <mm:include page="navigation.jspx" />
@@ -74,26 +73,44 @@
 
               <tr>
                 <td colspan="2">
+
+                  <mm:node number="$provider">
+                    <mm:relatednodes path="related,educations,related,tests" 
element="tests">
+                      <mm:relatednodescontainer role="related" 
type="problemtypes">
+                        <mm:size>
+                          <mm:compare value="0">
+                            <mm:node id="assessment_evaluationtest" />
+                          </mm:compare>
+                        </mm:size>
+                      </mm:relatednodescontainer>
+                    </mm:relatednodes>
+                  </mm:node>
+                  <mm:present referid="assessment_evaluationtest">
+
+
                   <!-- show answers to questions in final test -->
-                  <mm:node number="$assessment_evaluationtest" notfound="skip">
+                    <mm:node referid="assessment_evaluationtest">
                     <mm:node referid="owner">
+
                       <mm:compare referid="class" value="null">
                         <mm:relatednodes type="classes">
                           <mm:remove referid="class"/>
                           <mm:import id="class"><mm:field name="number" 
/></mm:import>
                         </mm:relatednodes>
                       </mm:compare>
-                      <mm:import id="copybookNo"><di:copybook /></mm:import>
+                        <di:copybook student="${_node}">
+                          <mm:node id="copybookNo" />
+                        </di:copybook>
                     </mm:node>
+
                     <!-- get madetest -->
                     <mm:relatednodescontainer path="madetests,copybooks" 
element="madetests">
                       <mm:constraint field="copybooks.number" 
referid="copybookNo"/>
-                      <mm:relatednodes>
-                        <mm:last>
+                        <mm:relatednodes max="1">
                           <mm:node id="madetest" />
-                        </mm:last>
                       </mm:relatednodes>
                     </mm:relatednodescontainer>
+
                     <!-- show question -->
                     <mm:present referid="madetest">
                       <mm:relatednodes type="questions" 
path="posrel,questions" orderby="posrel.pos">
@@ -108,13 +125,16 @@
                       </mm:relatednodes>
                     </mm:present>
                   </mm:node>
+                  </mm:present>
                 </td>
               </tr>
             </table>
+            <!--
             <input type="submit" />
             <mm:valid>
               VALID
             </mm:valid>
+            -->
           </mm:form>
         </mm:node>
       </div>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to