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

Modified Files:
        feedback.jspx index.jsp student.jspx 
Added Files:
        evaluationtest.jspf 
Log Message:



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


evaluationtest.jspf is new



Index: feedback.jspx
===================================================================
RCS file: 
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/feedback.jspx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- feedback.jspx       1 Aug 2008 15:13:33 -0000       1.4
+++ feedback.jspx       6 Aug 2008 17:09:12 -0000       1.5
@@ -82,27 +82,15 @@
               <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">
+                  <jsp:directive.include file="evaluationtest.jspf" />
 
+                  <mm:present referid="assessment_evaluationtest">
 
                     <!-- show answers to questions in final test -->
                     <mm:node referid="assessment_evaluationtest">
-                      <mm:node referid="owner">
-                        <di:copybook student="${_node}" 
classNumber="${studentClass}">
+                      <di:copybook student="${owner}" 
classNumber="${studentClass}">
                           <mm:node id="copybookNo" />
                         </di:copybook>
-                      </mm:node>
 
                       <!-- get madetest -->
                       <mm:relatednodescontainer path="madetests,copybooks" 
element="madetests">


Index: index.jsp
===================================================================
RCS file: 
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/index.jsp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- index.jsp   1 Aug 2008 09:02:46 -0000       1.28
+++ index.jsp   6 Aug 2008 17:09:12 -0000       1.29
@@ -25,7 +25,7 @@
         <div class="contentBody">
           <di:hasrole role="student">
             <di:hasrole role="teacher">
-              <form name="coachform" method="post">
+              <form name="coachform" method="get">
                 <select name="coachmode"
                         onchange="$('form[name =coachform]').submit();">
                   <mm:option value="true" compare="${coachmode}">


Index: student.jspx
===================================================================
RCS file: 
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/student.jspx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- student.jspx        1 Aug 2008 08:38:23 -0000       1.5
+++ student.jspx        6 Aug 2008 17:09:12 -0000       1.6
@@ -97,5 +97,42 @@
         </mm:relatednodes>
       </mm:node>
     </div>
+
+    <!--
+         Finally, the use is given the option to 'close' the last lesson
+    -->
+
+    <div>
+
+      <mm:import externid="step" />
+
+      <jsp:directive.include file="evaluationtest.jspf" />
+
+      <mm:treefile page="/assessment/closelesson.jsp"
+                   objectlist="$includePath"
+                   referids="$referids"
+                   write="false"
+                   >
+
+        <form name="closelessonform" action="${_}"   method="post">
+          <input type="submit" class="formbutton" 
value="${di:translate('assessment.back_to_lesson')}"  />
+          <mm:node number="lesson"  notfound="skip">
+            <mm:related path="posrel,problems,posrel,people" max="1" 
constraints="people.number=$user">
+              <input type="submit" class="formbutton" 
value="${di:translate('assessment.close_and_send_to_coach')}" />
+            </mm:related>
+          </mm:node>
+          <input type="submit" class="formbutton" 
value="${di:translate('assessment.close_and_send_to_coach')}" />
+        </form>
+        <mm:node number="$assessment_evaluationtest" notfound="skip">
+
+        </mm:node>
+        <form name="closelessonform" action="${_}"  method="post">
+          <mm:node number="" notfound="skip">
+            <input type="submit" class="formbutton" 
value="${di:translate('assessment.back_to_lesson')}"  />
+            <mm:param name="learnobject"></mm:param>
+          </mm:node>
+        </form>
+      </mm:treefile>
+    </div>
   </div>
 </div>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to