Author: michiel
Date: 2010-05-07 14:45:47 +0200 (Fri, 07 May 2010)
New Revision: 42106

Added:
   
didactor/trunk/components/assessment/src/main/webapp/assessment/assessment_coach_overview.jspx
Modified:
   
didactor/trunk/components/assessment/src/main/webapp/assessment/assessment_coach.jspx
Log:
introdcues 'subsub'

Modified: 
didactor/trunk/components/assessment/src/main/webapp/assessment/assessment_coach.jspx
===================================================================
--- 
didactor/trunk/components/assessment/src/main/webapp/assessment/assessment_coach.jspx
       2010-05-06 09:16:27 UTC (rev 42105)
+++ 
didactor/trunk/components/assessment/src/main/webapp/assessment/assessment_coach.jspx
       2010-05-07 12:45:47 UTC (rev 42106)
@@ -7,99 +7,14 @@
     class="coach">
 
   <jsp:output omit-xml-declaration="true" />
+  <mm:import externid="subsub" />
 
-  <mm:import externid="lesson" />
-  <mm:node number="$user" notfound="skip">
-    <div>
-      <table class="poplistTable">
-        <tr>
-          <th class="listHeader">&amp;nbsp;</th>
-          <mm:node number="$education">
-            <mm:relatednodescontainer element="learnblocks"  
path="posrel,learnblocks${di:setting('assessment', 'relate_learnblocks') ? 
',related,components' : ''}">
-              <mm:sortorder field="posrel.pos" />
-              <c:if test="${di:setting('assessment', 'relate_learnblocks')}">
-                <mm:addnode element="components" number="component.assessment" 
/>
-              </c:if>
-              <mm:relatednodes id="learnblocks">
-                <th class="listHeader">
-                  <mm:field name="name" />
-                  <!--
-                      <br />
-                      <di:translate key="assessment.period" /><jsp:text> 
</jsp:text><mm:index />
-                  -->
-                </th>
-              </mm:relatednodes>
-            </mm:relatednodescontainer>
-          </mm:node>
-        </tr>
-        <mm:relatednodes type="classes" path="classrel,classes" id="class">
-          <mm:relatednodescontainer
-              path="classrel,people,related,roles"
-              element="people">
-            <mm:constraint field="roles.name" value="student" />
-            <mm:distinct />
-            <mm:sortorder field="${di:setting('core', 'personorderfield')}" 
casesensitive="false" />
-            <mm:relatednodes id="student">
-
-              <mm:first>
-                <tr>
-                  <th class="listHeader">
-                    <di:img src="/assessment/gfx/minus.gif"
-                            title="assessment.show.problems"
-                            onclick="toggle(${class})"
-                            id="toggle_image${class}" />
-                    <jsp:text> </jsp:text>
-                    <mm:field name="name" node="class" />
-                  </th>
-                  <c:forEach begin="1" end="${fn:length(learnblocks)}">
-                    <th class="listHeader">&amp;nbsp;</th>
-                  </c:forEach>
-                </tr>
-              </mm:first>
-
-              <tr class="toggle_div${class}" id="toggle_div${class}_${_node}">
-                <td class="listItem">
-                <mm:node>
-                <mm:link>
-                       
-                       <mm:param 
name="subsub">coach_student_overview</mm:param>
-                       <mm:param name="student_id">${_node}</mm:param>
-                  <a href="${_}"><mm:field name="firstname"/></a>
-                </mm:link>
-                </mm:node>
-                </td>
-                <mm:relatednodes referid="learnblocks" id="learnblock">
-                  <td class="listItem">
-
-                    <mm:node number="$student">
-                      <di:copybook>
-                        <mm:node id="copybookNo" />
-                      </di:copybook>
-                    </mm:node>
-                    <mm:node number="$student">
-                      <mm:relatednodescontainer type="shouts">
-                        <mm:constraint field="reference" value="${learnblock}" 
/>
-                        <mm:link page="/c/shoutbox/index/" 
referids="learnbl...@reference">
-                          <mm:param name="source">${_node}</mm:param>
-                          (<a href="${_}" name=""><mm:size /></a>)
-                        </mm:link>
-                      </mm:relatednodescontainer>
-                    </mm:node>
-                  </td>
-                </mm:relatednodes>
-                  <td>
-                    <mm:node number="$student">
-                      <mm:link page="/c/shoutbox/index/">
-                        <mm:param name="source">${_node}</mm:param>
-                        <a href="${_}" name=""><di:translate 
key="assessment.messages"/></a>
-                      </mm:link>
-                    </mm:node>
-                  </td>
-              </tr>
-            </mm:relatednodes>
-          </mm:relatednodescontainer>
-        </mm:relatednodes>
-      </table>
-    </div>
-  </mm:node>
+  <c:choose>
+    <c:when test="${empty subsub}">
+      <mm:include debug="xml" page="assessment_coach_overview.jspx" />
+    </c:when>
+    <c:otherwise>
+      <mm:include debug="xml" page="${subsub}.jspx" />
+    </c:otherwise>
+  </c:choose>
 </div>

Added: 
didactor/trunk/components/assessment/src/main/webapp/assessment/assessment_coach_overview.jspx
===================================================================
--- 
didactor/trunk/components/assessment/src/main/webapp/assessment/assessment_coach_overview.jspx
                              (rev 0)
+++ 
didactor/trunk/components/assessment/src/main/webapp/assessment/assessment_coach_overview.jspx
      2010-05-07 12:45:47 UTC (rev 42106)
@@ -0,0 +1,106 @@
+<div
+    xmlns:jsp="http://java.sun.com/JSP/Page";
+    xmlns:c="http://java.sun.com/jsp/jstl/core";
+    xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
+    xmlns:di="http://www.didactor.nl/ditaglib_1.0";
+    xmlns:fn="http://java.sun.com/jsp/jstl/functions";
+    class="coach">
+
+  <jsp:output omit-xml-declaration="true" />
+  <mm:import externid="sub" />
+  <mm:import externid="subsub" />
+  <mm:import externid="lesson" />
+
+  <mm:node number="$user" notfound="skip">
+    <div>
+      <table class="poplistTable">
+        <tr>
+          <th class="listHeader">&amp;nbsp;</th>
+          <mm:node number="$education">
+            <mm:relatednodescontainer element="learnblocks"  
path="posrel,learnblocks${di:setting('assessment', 'relate_learnblocks') ? 
',related,components' : ''}">
+              <mm:sortorder field="posrel.pos" />
+              <c:if test="${di:setting('assessment', 'relate_learnblocks')}">
+                <mm:addnode element="components" number="component.assessment" 
/>
+              </c:if>
+              <mm:relatednodes id="learnblocks">
+                <th class="listHeader">
+                  <mm:field name="name" />
+                  <!--
+                      <br />
+                      <di:translate key="assessment.period" /><jsp:text> 
</jsp:text><mm:index />
+                  -->
+                </th>
+              </mm:relatednodes>
+            </mm:relatednodescontainer>
+          </mm:node>
+        </tr>
+        <mm:relatednodes type="classes" path="classrel,classes" id="class">
+          <mm:relatednodescontainer
+              path="classrel,people,related,roles"
+              element="people">
+            <mm:constraint field="roles.name" value="student" />
+            <mm:distinct />
+            <mm:sortorder field="${di:setting('core', 'personorderfield')}" 
casesensitive="false" />
+            <mm:relatednodes id="student">
+
+              <mm:first>
+                <tr>
+                  <th class="listHeader">
+                    <di:img src="/assessment/gfx/minus.gif"
+                            title="assessment.show.problems"
+                            onclick="toggle(${class})"
+                            id="toggle_image${class}" />
+                    <jsp:text> </jsp:text>
+                    <mm:field name="name" node="class" />
+                  </th>
+                  <c:forEach begin="1" end="${fn:length(learnblocks)}">
+                    <th class="listHeader">&amp;nbsp;</th>
+                  </c:forEach>
+                </tr>
+              </mm:first>
+
+              <tr class="toggle_div${class}" id="toggle_div${class}_${_node}">
+                <td class="listItem">
+                  <mm:node>
+                    <mm:link referids="sub?">
+                      <mm:param name="subsub">coach_student_overview</mm:param>
+                      <mm:param name="student_id">${_node}</mm:param>
+                      <a href="${_}"><mm:field name="firstname"/></a>
+                    </mm:link>
+                  </mm:node>
+                </td>
+                <mm:relatednodes referid="learnblocks" id="learnblock">
+                  <td class="listItem">
+
+                    <mm:node number="$student">
+                      <di:copybook>
+                        <mm:node id="copybookNo" />
+                      </di:copybook>
+                    </mm:node>
+                    <mm:node number="$student">
+                      <mm:relatednodescontainer type="shouts">
+                        <mm:constraint field="reference" value="${learnblock}" 
/>
+                        <mm:link page="/c/shoutbox/index/" 
referids="learnbl...@reference">
+                          <mm:param name="source">${_node}</mm:param>
+                          (<a href="${_}" name=""><mm:size /></a>)
+                        </mm:link>
+                      </mm:relatednodescontainer>
+                    </mm:node>
+                  </td>
+                </mm:relatednodes>
+                  <td>
+                    <mm:node number="$student">
+                      <mm:link page="/c/shoutbox/index/">
+                        <mm:param name="source">${_node}</mm:param>
+                        <a href="${_}" name=""><di:translate 
key="assessment.messages"/></a>
+                      </mm:link>
+                    </mm:node>
+                  </td>
+              </tr>
+            </mm:relatednodes>
+          </mm:relatednodescontainer>
+        </mm:relatednodes>
+      </table>
+    </div>
+  </mm:node>
+</div>

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to