Author: michiel
Date: 2009-06-03 13:58:18 +0200 (Wed, 03 Jun 2009)
New Revision: 35612
Added:
didactor/tags/Didactor-2_3_0_beta_2009week01/src/assessment/templates/assessment/coach_student_overview.jspx
didactor/tags/Didactor-2_3_0_beta_2009week01/src/assessment/templates/assessment/stage2-evaluate-coach.jspx
Modified:
didactor/tags/Didactor-2_3_0_beta_2009week01/src/assessment/templates/assessment/problem.item.jspx
Log:
some new files, probably made by Jelle
Added:
didactor/tags/Didactor-2_3_0_beta_2009week01/src/assessment/templates/assessment/coach_student_overview.jspx
===================================================================
---
didactor/tags/Didactor-2_3_0_beta_2009week01/src/assessment/templates/assessment/coach_student_overview.jspx
(rev 0)
+++
didactor/tags/Didactor-2_3_0_beta_2009week01/src/assessment/templates/assessment/coach_student_overview.jspx
2009-06-03 11:58:18 UTC (rev 35612)
@@ -0,0 +1,89 @@
+<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:mm-sr="http://www.mmbase.org/tags/mm/searchrelate";
+ class="problems">
+ <jsp:output omit-xml-declaration="true" />
+
+ <!--
+ Now the problems, divided per type.
+ -->
+ <di:hasrole role="teacher">
+ <mm:import externid="student_id" from="parameters" />
+ <mm:link page="/homework/">
+ <mm:param name="sub">assessment_coach</mm:param>
+ <a href="${_}">&lt; terug naar studentenoverzicht</a>
+ </mm:link>
+
+
+ <h2>Probleemlijst overzicht <mm:node number="${student_id}"><mm:field
id="studentName" name="firstname"/></mm:node> </h2>
+ <div>
+ <p>Dit is een overzicht van de problemenlijst van ${studentName}</p>
+ </div>
+
+
+ <div class="list goals">
+ <h2>Belangrijke dingen</h2>
+ <ol>
+ <mm:node number="${student_id}">
+ <mm:relatednodes type="goals" role="posrel" orderby="posrel.pos">
+ <li><mm:field name="name" /></li>
+ </mm:relatednodes>
+ </mm:node>
+ </ol>
+ </div>
+
+ <table>
+
+ <mm:node number="${education}">
+ <mm:import id="blocknames" escape="text/plain">
+ <!-- cache the block names, because they are repeated for every
problem type -->
+
+ <mm:nodelistfunction name="lessons" id="learnBlock">
+ <!--
+ If a relation learnBlock -classrel->user exists, then that
means that this lesson is marked 'closed' (by this module)
+ -->
+ <mm:relation to="${student_id}" role="classrel" searchdir="source"
notfound="null">
+ <td class="learnblockItemsTitle ${empty _node ? '' : 'closed'}">
+ <mm:field name="name" node="learnBlock" />
+ </td>
+ </mm:relation>
+ </mm:nodelistfunction>
+ <td><jsp:text> </jsp:text></td>
+
+ </mm:import>
+ </mm:node>
+
+
+ <mm:listnodes orderby="pos" type="problemtypes">
+ <tr>
+ <td><h2 class="problemTypes"><di:translate
key="assessment.${_node.key}" /></h2></td>
+ <mm:write referid="blocknames" escape="text/plain"/>
+ </tr>
+ <mm:import externid="sub" />
+ <mm:import externid="stage" />
+
+ <mm:relatednodescontainer path="related,problems,posrel,people"
element="problems">
+ <mm:addnode element="people" number="${student_id}" />
+ <mm:sortorder field="posrel.pos" />
+ <mm:size id="size" write="false"/>
+ <c:if test="${size eq 0}">
+ <tr class="problemItem"><td colspan="7">--</td></tr>
+ </c:if>
+ <mm:relatednodes>
+ <mm:include page="/assessment/matrix.div.coach.jspx"
referids="sub?,stage?,_n...@source">
+ <mm:param name="student_id">${student_id}</mm:param>
+ </mm:include>
+ <tr><td colspan="7"><jsp:text> </jsp:text></td></tr>
+ </mm:relatednodes>
+ </mm:relatednodescontainer>
+ <tr class="problemTypeSpacer"><td colspan="7"><jsp:text>
</jsp:text></td></tr>
+ </mm:listnodes>
+
+ </table>
+
+ </di:hasrole>
+
+</div>
Modified:
didactor/tags/Didactor-2_3_0_beta_2009week01/src/assessment/templates/assessment/problem.item.jspx
===================================================================
---
didactor/tags/Didactor-2_3_0_beta_2009week01/src/assessment/templates/assessment/problem.item.jspx
2009-06-03 11:54:20 UTC (rev 35611)
+++
didactor/tags/Didactor-2_3_0_beta_2009week01/src/assessment/templates/assessment/problem.item.jspx
2009-06-03 11:58:18 UTC (rev 35612)
@@ -11,15 +11,21 @@
<mm:import externid="source" required="true" />
<mm:import externid="confirm" />
<mm:import externid="icondir" />
+ <mm:import id="currentlesson" from="session"
externid="currentlesson_${user}_${education}" />
<mm:node id="problem">
- <mm:fieldlist fields="name,type">
+
+ <mm:field name="name" />
+
+
+ <div class="problemItemCategories">
+ <mm:field name="type">
+ <mm:locale language="nl">
<mm:fieldinfo type="input" />
<mm:fieldinfo type="errors" />
- </mm:fieldlist>
-
- <mm:import id="currentlesson" from="session"
externid="currentlesson_${user}_${education}" />
-
+ </mm:locale>
+ </mm:field>
+
<mm:present referid="currentlesson">
<mm:isnotempty referid="currentlesson">
<mm:relation to="${currentlesson}" role="posrel" notfound="null">
@@ -29,12 +35,12 @@
<mm:node number="${problem}" id="dest" />
<mm:createrelation id="new" source="ll" destination="dest"
role="posrel" commitonclose="true">
<!-- default value of how much trouble -->
- <mm:setfield name="pos">4</mm:setfield>
+ <mm:setfield name="pos">2</mm:setfield>
</mm:createrelation>
</mm:cloud>
</c:if>
</mm:relation>
-
+
<mm:listrelationscontainer type="learnobjects" role="posrel">
<mm:addnode element="learnobjects" number="${currentlesson}" />
<mm:listrelations id="relation">
@@ -45,8 +51,11 @@
</mm:listrelations>
</mm:listrelationscontainer>
</mm:isnotempty>
+ <mm:isempty referid="currentlesson">
+ <div class="selectTroublesSpacer">&nbsp;</div>
+ </mm:isempty>
</mm:present>
-
- <mm-sr:delete source="${source}" confirm="${confirm}" icondir="${icondir}"
/>
+ </div>
</mm:node>
+
</jsp:root>
Added:
didactor/tags/Didactor-2_3_0_beta_2009week01/src/assessment/templates/assessment/stage2-evaluate-coach.jspx
===================================================================
---
didactor/tags/Didactor-2_3_0_beta_2009week01/src/assessment/templates/assessment/stage2-evaluate-coach.jspx
(rev 0)
+++
didactor/tags/Didactor-2_3_0_beta_2009week01/src/assessment/templates/assessment/stage2-evaluate-coach.jspx
2009-06-03 11:58:18 UTC (rev 35612)
@@ -0,0 +1,54 @@
+<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:mm-sr="http://www.mmbase.org/tags/mm/searchrelate";
+ class="problems stage5">
+ <jsp:output omit-xml-declaration="true" />
+ <!--
+
+ xmlns:mm-sr="urn:jsptagdir:/WEB-INF/tags/mm/searchrelate/"
+
+ -->
+ <mm:import externid="problem" required="true" />
+ <mm:import externid="test" required="true" />
+ <mm:import externid="sub" />
+ <mm:import externid="student_id" required="true"/>
+
+ <mm:link page="/content/js/open.jsp">
+ <script type="text/javascript" src="${_}"><jsp:text> </jsp:text></script>
+ </mm:link>
+
+ <mm:node referid="problem">
+ <p>
+ <mm:link page="/homework/">
+ <mm:param name="sub">assessment_coach</mm:param>
+ <a href="${_}">&lt;&lt; terug naar
studentenoverzicht</a>
+ </mm:link>
+ </p>
+ <p>
+ <mm:link page="/homework/">
+ <mm:param
name="subsub">coach_student_overview</mm:param>
+ <mm:param name="student_id">${student_id}</mm:param>
+ <a href="${_}">&lt; terug naar probleemlijst van
<mm:node number="${student_id}"><mm:field id="studentName"
name="firstname"/></mm:node></a>
+ </mm:link>
+ </p>
+
+
+ <div id="contentFrame" style="clear: both;">
+ <mm:include page="/education/tests/viewanswers.jsp"
+ referids="t...@learnobject" />
+ </div>
+
+
+ <mm:link page="/assessment/stage5.js.jsp">
+ <script type="text/javascript" src="${_}">
+ <jsp:text> </jsp:text>
+ </script>
+ </mm:link>
+
+ </mm:node>
+
+
+</div>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
