Author: michiel Date: 2010-05-07 15:01:52 +0200 (Fri, 07 May 2010) New Revision: 42107
Modified: didactor/trunk/components/assessment/src/main/webapp/assessment/coach_student_overview.jspx didactor/trunk/components/assessment/src/main/webapp/assessment/matrix.div.coach.jspx didactor/trunk/components/assessment/src/main/webapp/assessment/stage2-evaluate-coach.jspx Log: rationalized a bit here and there Modified: didactor/trunk/components/assessment/src/main/webapp/assessment/coach_student_overview.jspx =================================================================== --- didactor/trunk/components/assessment/src/main/webapp/assessment/coach_student_overview.jspx 2010-05-07 12:45:47 UTC (rev 42106) +++ didactor/trunk/components/assessment/src/main/webapp/assessment/coach_student_overview.jspx 2010-05-07 13:01:52 UTC (rev 42107) @@ -7,43 +7,47 @@ class="problems"> <jsp:output omit-xml-declaration="true" /> + <mm:import externid="sub" /> + <mm:import externid="subsub" /> <!-- 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"> - <mm:node> - <li><mm:field name="name" /></li> - </mm:node> - </mm:relatednodes> - </mm:node> - </ol> - </div> + --> + <di:hasrole role="teacher"> + <mm:import externid="student_id" from="parameters" /> + <mm:link page="/homework/" referids="sub?" > + <a href="${_}">&lt; terug naar studentenoverzicht</a> + </mm:link> - <table> - <mm:node number="${education}"> - <mm:import id="blocknames" escape="text/plain"> - <!-- cache the block names, because they are repeated for every problem type --> + <h2> + <jsp:text>Probleemlijst overzicht </jsp:text> + <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> - <mm:nodelistfunction name="lessons" id="learnBlock"> + + <div class="list goals"> + <h2>Belangrijke dingen</h2> + <ol> + <mm:node number="${student_id}"> + <mm:relatednodes type="goals" role="posrel" orderby="posrel.pos"> + <mm:node> + <li><mm:field name="name" /></li> + </mm:node> + </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) --> @@ -64,7 +68,6 @@ <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"> @@ -75,7 +78,7 @@ <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:include page="/assessment/matrix.div.coach.jspx" referids="sub?,subsub?,stage?,_n...@source"> <mm:param name="student_id">${student_id}</mm:param> </mm:include> <tr><td colspan="7"><jsp:text> </jsp:text></td></tr> Modified: didactor/trunk/components/assessment/src/main/webapp/assessment/matrix.div.coach.jspx =================================================================== --- didactor/trunk/components/assessment/src/main/webapp/assessment/matrix.div.coach.jspx 2010-05-07 12:45:47 UTC (rev 42106) +++ didactor/trunk/components/assessment/src/main/webapp/assessment/matrix.div.coach.jspx 2010-05-07 13:01:52 UTC (rev 42107) @@ -10,114 +10,112 @@ > <jsp:output omit-xml-declaration="true" /> -<di:hasrole role="teacher"> - <mm:import externid="source" required="true" /> - <mm:import externid="icondir" /> - <mm:import externid="student_id" required="true"/> + <di:hasrole role="teacher"> + <mm:import externid="source" required="true" /> + <mm:import externid="icondir" /> + <mm:import externid="student_id" required="true"/> - <!-- Display the problem itself --> - <tr class="problemItem"> - <td class="problemName"><mm:field name="name" /> </td> + <!-- Display the problem itself --> + <tr class="problemItem"> + <td class="problemName"><mm:field name="name" /> </td> - <mm:node id="problem" number="${_node}" /> <!-- give current node an id, and put it in the current cloud --> + <mm:node id="problem" number="${_node}" /> <!-- give current node an id, and put it in the current cloud --> - <c:set var="blockCount" value="0" /> + <c:set var="blockCount" value="0" /> - <!-- And, per lesson, how much trouble it gave --> - <mm:node number="${education}"> - <mm:nodelistfunction name="lessons" id="learnBlock"> - <!-- - Create the relation problem-posrel->learnBlock if that does not exist yet. The - 'position' field is abused to indicate how much trouble the problem gave after this - lesson. Really, there should not have been used 'posrel' here. Because _pos_rel is of - course for _position_, and is not some generic integer which can be used for whatever one - likes. - Only for closed lessons, and the first open one. - _I_ did not come up with this. - --> - <mm:relation to="${student_id}" notfound="null"> - <c:if test="${! empty _node or empty firstopenlesson}"> - <c:if test="${empty _node}"> - <mm:node node="learnBlock" id="firstopenlesson" /> + <!-- And, per lesson, how much trouble it gave --> + <mm:node number="${education}"> + <mm:nodelistfunction name="lessons" id="learnBlock"> + <!-- + Create the relation problem-posrel->learnBlock if that does not exist yet. The + 'position' field is abused to indicate how much trouble the problem gave after this + lesson. Really, there should not have been used 'posrel' here. Because _pos_rel is of + course for _position_, and is not some generic integer which can be used for whatever one + likes. + Only for closed lessons, and the first open one. + _I_ did not come up with this. + --> + <mm:relation to="${student_id}" notfound="null"> + <c:if test="${! empty _node or empty firstopenlesson}"> + <c:if test="${empty _node}"> + <mm:node node="learnBlock" id="firstopenlesson" /> + </c:if> + <mm:node referid="problem"> + <mm:relation to="${learnBlock}" role="posrel" notfound="null"> + <c:if test="${empty _node}"> + <mm:cloud> + <!-- create the relation outside the transaction, because it simply must happen, and immediately --> + <mm:context> + <mm:node number="${learnBlock}" id="source" /> + <mm:node number="${problem}" id="dest" /> + <mm:createrelation id="new" source="source" destination="dest" role="posrel" commitonclose="true"> + <!-- default value of how much trouble --> + <mm:setfield name="pos">4</mm:setfield> + </mm:createrelation> + </mm:context> + </mm:cloud> + + </c:if> + </mm:relation> + </mm:node> </c:if> - <mm:node referid="problem"> - <mm:relation to="${learnBlock}" role="posrel" notfound="null"> - <c:if test="${empty _node}"> - <mm:cloud> - <!-- create the relation outside the transaction, because it simply must happen, and immediately --> - <mm:context> - <mm:node number="${learnBlock}" id="source" /> - <mm:node number="${problem}" id="dest" /> - <mm:createrelation id="new" source="source" destination="dest" role="posrel" commitonclose="true"> - <!-- default value of how much trouble --> - <mm:setfield name="pos">4</mm:setfield> - </mm:createrelation> - </mm:context> - </mm:cloud> + </mm:relation> - </c:if> - </mm:relation> - </mm:node> - </c:if> - </mm:relation> + <!-- now let the user _edit_ (if first 'open' lesson) + this relation, or only _see_ (if 'closed' lesson). + That is, inidcate how much trouble the problem is now causing. + --> - <!-- now let the user _edit_ (if first 'open' lesson) - this relation, or only _see_ (if 'closed' lesson). - That is, inidcate how much trouble the problem is now causing. - --> + <mm:listrelationscontainer type="problems" role="posrel"> + <mm:addnode element="problems" number="${problem}" /> - <mm:listrelationscontainer type="problems" role="posrel"> - <mm:addnode element="problems" number="${problem}" /> + <mm:listrelations id="relation"> + <mm:field name="pos" write="false"> + <!-- See MMB-1770 --> + <fmt:bundle basename="nl.didactor.resources.troubles"> + <td class="learnblockItems"><fmt:message key="${_}" /></td> + </fmt:bundle> + </mm:field> + <c:set var="blockCount" value="${blockCount + 1}" /> + </mm:listrelations> - <mm:listrelations id="relation"> - <mm:field name="pos" write="false"> - <!-- See MMB-1770 --> - <fmt:bundle basename="nl.didactor.resources.troubles"> - <td class="learnblockItems"><fmt:message key="${_}" /></td> - </fmt:bundle> - </mm:field> - <c:set var="blockCount" value="${blockCount + 1}" /> - </mm:listrelations> + </mm:listrelationscontainer> + </mm:nodelistfunction> - </mm:listrelationscontainer> - </mm:nodelistfunction> + </mm:node> - </mm:node> + <mm:import externid="stage" /> + <mm:import externid="sub" /> + <mm:import externid="subsub" /> - <mm:import externid="stage" /> - <mm:import externid="sub" /> - - <mm:relatednodes max="1" path="problemtypes,tests" element="tests"> - <mm:node id="test" /> - </mm:relatednodes> - <mm:present referid="test"> - <di:copybook student="${student_nr}"> - <mm:node> - <mm:list path="madetests,tests" constraints="tests.number = ${test}" fields="madetests.number"> + <mm:relatednodes max="1" path="problemtypes,tests" element="tests"> + <mm:node id="test" /> + </mm:relatednodes> + <mm:present referid="test"> + <di:copybook student="${student_nr}"> + <mm:node> + <mm:list path="madetests,tests" constraints="tests.number = ${test}" fields="madetests.number"> <mm:field name="madetests.number" id="madeTest" write="false"/> - </mm:list> - </mm:node> - </di:copybook> - - + </mm:list> + </mm:node> + </di:copybook> - <mm:link referids="test,_n...@problem,student_id?"> - <mm:param name="subsub">stage2-evaluate-coach</mm:param> - - <mm:param name="testNo">${test}</mm:param> - <mm:param name="madetestNo">${madeTest}</mm:param> - <mm:param name="userNo">${student_id}</mm:param> - - <td colspan="${fn:length(learnBlock) - blockCount}" class="learnblockItems" align="right"> - <a href="${_}">bekijk uitwerking</a> - </td> - </mm:link> - </mm:present> - </tr> - + + + <mm:link referids="test,_n...@problem,student_id,sub?"> + <mm:param name="subsub">stage2-evaluate-coach</mm:param> + <mm:param name="testNo">${test}</mm:param> + <mm:param name="madetestNo">${madeTest}</mm:param> + <td colspan="${fn:length(learnBlock) - blockCount}" class="learnblockItems" align="right"> + <a href="${_}">bekijk uitwerking</a> + </td> + </mm:link> + </mm:present> + </tr> + </di:hasrole> </mm:content> Modified: didactor/trunk/components/assessment/src/main/webapp/assessment/stage2-evaluate-coach.jspx =================================================================== --- didactor/trunk/components/assessment/src/main/webapp/assessment/stage2-evaluate-coach.jspx 2010-05-07 12:45:47 UTC (rev 42106) +++ didactor/trunk/components/assessment/src/main/webapp/assessment/stage2-evaluate-coach.jspx 2010-05-07 13:01:52 UTC (rev 42107) @@ -14,12 +14,13 @@ <mm:import externid="problem" required="true" /> <mm:import externid="test" required="true" /> <mm:import externid="sub" /> - <mm:import externid="student_id" required="true"/> + <mm:import externid="student_id" required="true"/> <mm:link page="/content/js/open.jsp"> <script type="text/javascript" src="${_}"><jsp:text><!-- btw, IE sucks --></jsp:text></script> </mm:link> + <h3><mm:node number="${student_id}"><mm:field name="firstname"/></mm:node></h3> <mm:node referid="problem"> <p> <mm:link page="/homework/"> @@ -38,7 +39,7 @@ <div id="contentFrame" style="clear: both;"> <mm:include page="/education/tests/viewanswers.jsp" - referids="t...@learnobject" /> + referids="t...@learnobject,student...@userno" /> </div> <!-- This is not a form, so it does not need commit _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs