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

Modified Files:
        coach.jspx feedback.jspx index.jsp 
Log Message:
details


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


Index: coach.jspx
===================================================================
RCS file: 
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/coach.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- coach.jspx  1 Aug 2008 08:49:52 -0000       1.1
+++ coach.jspx  1 Aug 2008 09:02:46 -0000       1.2
@@ -58,25 +58,30 @@
                         </mm:relatednodes>
                       </mm:relation>
 
-                      <mm:notpresent referid="feedback">
+                      <c:choose>
+                        <c:when test="${empty feedback}">
                         &amp;nbsp;
-                      </mm:notpresent>
-                      <mm:present referid="feedback">
+                        </c:when>
+                        <c:otherwise>
                         <mm:treefile
                             page="/assessment/feedback.jspx" 
objectlist="$includePath"
                             referids="$referids,[EMAIL PROTECTED]"
                             write="false"
                             >
+                            <mm:param name="coachmode" value="true" />
                           <a href="${_}">
                             <di:img src="${feedback.status ge 0 ? 
'/assessment/gfx/todevelop.gif' : '/assessment/gfx/developed.gif'}"
                                     title="assessment.goto_feedback" />
                           </a>
                         </mm:treefile>
-                      </mm:present>
+                          <mm:remove referid="feedback" />
+                        </c:otherwise>
+                      </c:choose>
 
                       <mm:node number="$student">
                         <di:copybook />
                       </mm:node>
+
                       <mm:node number="${assessment_evaluationtest}" 
notfound="skip">
                         <!-- get madetest -->
                         <mm:relatednodescontainer path="madetests,copybooks" 
element="madetests">


Index: feedback.jspx
===================================================================
RCS file: 
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/feedback.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- feedback.jspx       31 Jul 2008 10:57:25 -0000      1.1
+++ feedback.jspx       1 Aug 2008 09:02:46 -0000       1.2
@@ -11,7 +11,9 @@
   <div class="rows">
 
     <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" />
 


Index: index.jsp
===================================================================
RCS file: 
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/index.jsp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- index.jsp   1 Aug 2008 08:19:24 -0000       1.27
+++ index.jsp   1 Aug 2008 09:02:46 -0000       1.28
@@ -13,8 +13,8 @@
       component="assessmment" >
 
     <mm:import externid="coachmode">
-      <di:hasrole role="coach">true</di:hasrole>
-      <di:hasrole role="coach" inverse="true">false</di:hasrole>
+      <di:hasrole role="teacher">true</di:hasrole>
+      <di:hasrole role="teacher" inverse="true">false</di:hasrole>
     </mm:import>
 
     <div class="rows">
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to