EduploneTest/skins/EduploneTest eduplone_userResults2.pt,1.1,1.2
Nils Haagen <[email protected]>
| Newsgroups | gmane.comp.web.zope.eduplone.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/eduplone/EduploneTest/skins/EduploneTest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10872/skins/EduploneTest
Modified Files:
eduplone_userResults2.pt
Log Message:
c early and often: FreeText in results-overview
Index: eduplone_userResults2.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/skins/EduploneTest/eduplone_userResults2.pt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** eduplone_userResults2.pt 7 Nov 2004 16:28:11 -0000 1.1
--- eduplone_userResults2.pt 7 Nov 2004 17:34:01 -0000 1.2
***************
*** 57,60 ****
--- 57,61 ----
</tal:typeswitch>
+ <!-- = = = = = = -->
<tal:typeswitch tal:condition="python: quest.meta_type == 'eduplone FreeText'">
***************
*** 62,83 ****
<bR><bR>
! <tal tal:define="qId python:quest.getId();
! uAnswer python:here.getSingleAnswer(qId, qId)">
! <h2 tal:content="python: str(here.evalFreeTextAnswer(qId, uAnswer, 1))" />
! </tal>
!
! <table border="1" >
<tr>
! <td style="font-weight:bold; background-color:lightgrey;" i18n:translate="label_answer_alternatives">Answer alternatives</td>
! <td style="font-weight:bold; background-color:lightgrey;" i18n:translate="label_user_answer">User answer</td>
! <td style="font-weight:bold; background-color:lightgrey;" i18n:translate="label_correct">correct ?</td>
! <td style="font-weight:bold; background-color:lightgrey;" i18n:translate="label_user_score">Score</td>
</tr>
</table>
!
</tal:typeswitch>
! <!-- == TYPESWITCH == -->
<table border="1" tal:condition="python: quest.meta_type != 'eduplone FreeText'">
<tr>
--- 63,97 ----
<bR><bR>
! <table border="1" tal:define="qId python:quest.getId();
! uAnswer python:here.getSingleAnswer(qId, qId);
! evalFTA python:here.evalFreeTextAnswer(qId, uAnswer, 2)">
<tr>
! <td style="font-weight:bold; background-color:lightgrey;" i18n:translate="label_answer_alternatives">Answer alternatives</td>
! <td style="font-weight:bold; background-color:lightgrey;" i18n:translate="label_occurs_in_useranswer">occurs in userAnswer?</td>
! <td style="font-weight:bold; background-color:lightgrey;" i18n:translate="label_user_score">Score</td>
</tr>
+
+ <tr tal:repeat="answerObj python:here.filteredAnswerValues(qId)">
+ <td>
+ <tal tal:repeat="answer python:answerObj.getCorrectAnswer()">
+ <span tal:content="answer" /> <br>
+ </tal>
+ </td>
+ <td >
+ <img src="" tal:attributes="src python:defimages[evalFTA[answerObj.getId()]]" />
+ </td>
+ <td>
+ <tal tal:condition="python: evalFTA[answerObj.getId()]">
+ <b tal:content="python: round(float(quest.getScore())/float(len(quest.filteredAnswerValues(quest.getId()))),2)" />
+ </tal>
+ </td>
+ </tr>
</table>
!
</tal:typeswitch>
! <!-- = = = = = = -->
!
<table border="1" tal:condition="python: quest.meta_type != 'eduplone FreeText'">
<tr>
***************
*** 149,164 ****
</tal:typeswitch>
<!-- = -->
- <tal:typeswitch tal:condition="python: MType in ['eduplone FreeTextAnswer',]">
- <td tal:content="python: answer.getCorrectAnswer()" />
- <td tal:content="python: here.getSingleAnswer(quest.getId(),answer.getId())" />
- <td>
- <img src="" tal:attributes="src python:defimages[here.evalAnswer(quest.getId(), answer.getId(), here.getSingleAnswer(quest.getId(), answer.getId()))]"/>
- </td>
- <td>
- <tal tal:condition="python: here.evalAnswer(quest.getId(), answer.getId(), here.getSingleAnswer(quest.getId(), answer.getId()))">
- <b tal:content="python: round(float(quest.getScore())/float(len(quest.filteredAnswerValues(quest.getId()))),2)" />
- </tal>
- </td>
- </tal:typeswitch>
--- 163,166 ----
-------------------------------------------------------
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click