EduploneTest/skins/EduploneTest batch_parent_macros.pt,1.2,1.3 eduplone_userResults2.pt,1.3,1.4 test_environment_feedback.pt,1.2,1.3 test_environment_listing.pt,1.5,1.6 eduplone_userResults.pt,1.6,NONE

Update of /cvsroot/eduplone/EduploneTest/skins/EduploneTest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19531/skins/EduploneTest

Modified Files:
	batch_parent_macros.pt eduplone_userResults2.pt 
	test_environment_feedback.pt test_environment_listing.pt 
Removed Files:
	eduplone_userResults.pt 
Log Message:
fixes in results for single choice, minor cleanups

Index: eduplone_userResults2.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/skins/EduploneTest/eduplone_userResults2.pt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** eduplone_userResults2.pt	7 Nov 2004 17:48:00 -0000	1.3
--- eduplone_userResults2.pt	8 Nov 2004 16:34:17 -0000	1.4
***************
*** 112,120 ****
  		    </td>
  		    <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>
--- 112,128 ----
  		    </td>
  		    <td>
! 			<!--b tal:condition="python: answer.getId()==here.getSingleAnswer(quest.getId(),answer.getId()) or answer.getCorrectAnswer()==True"-->
! 			    	
! 			    <img src="" tal:condition="python: answer.getId()==here.getSingleAnswer(quest.getId(),answer.getId())" 
! 				        tal:attributes="src python:defimages[here.evalAnswer(quest.getId(), answer.getId(), here.getSingleAnswer(quest.getId(), answer.getId()))]"/>
! 			
! 			    <img src="" tal:condition="python: answer.getId()!=here.getSingleAnswer(quest.getId(),answer.getId()) and answer.getCorrectAnswer()==True" 
! 				        tal:attributes="src python:defimages[1]"/>
! 				      
! 			<!--/b-->
  		    </td>		
  		    <td>
  			<tal tal:condition="python: here.evalAnswer(quest.getId(), answer.getId(), here.getSingleAnswer(quest.getId(), answer.getId()))">
! 			    <b tal:content="python: quest.getScore()" /> 
  			</tal>
  		    </td>

--- eduplone_userResults.pt DELETED ---

Index: test_environment_listing.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/skins/EduploneTest/test_environment_listing.pt,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** test_environment_listing.pt	8 Nov 2004 11:29:20 -0000	1.5
--- test_environment_listing.pt	8 Nov 2004 16:34:17 -0000	1.6
***************
*** 52,57 ****
  				
  				<span i18n:translate="text_test_started">The test has begun.</span>
  				<a tal:attributes="href python:'#';
! 						   onClick python:'javascript:startTest(\'' + here.fixedObjectValues()[0].absolute_url() + '/task_view\')'" i18n:translate="text_click_here">Click here to start.</a>
  			    </div>
  			    
--- 52,64 ----
  				
  				<span i18n:translate="text_test_started">The test has begun.</span>
+ 				<bR><bR>
+ 				
+ 				<a tal:attributes="href python: here.fixedObjectValues()[0].absolute_url() + '/task_view'"
+ 				   i18n:translate="text_click_here">Click here to start.</a>
+ 				<bR>
  				<a tal:attributes="href python:'#';
! 						   onClick python:'javascript:startTest(\'' + here.fixedObjectValues()[0].absolute_url() + '/task_view\')'" 
! 						   i18n:translate="text_click_here_new_window">Click here to start in a new Window.</a>
! 						   
  			    </div>
  			    

Index: test_environment_feedback.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/skins/EduploneTest/test_environment_feedback.pt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** test_environment_feedback.pt	8 Nov 2004 11:40:04 -0000	1.2
--- test_environment_feedback.pt	8 Nov 2004 16:34:17 -0000	1.3
***************
*** 22,26 ****
  	    		 userId      python:currentUser.getId();">
  	    
! 	<p tal:condition="here/showresults">	    
  	     <span i18n:translate="label_total_available_score">Total available Score:</span> 
  	     <b tal:content="python: here.getTotalAvailableScore()" />
--- 22,26 ----
  	    		 userId      python:currentUser.getId();">
  	    
! 	<p tal:condition="python: here.showresults">	    
  	     <span i18n:translate="label_total_available_score">Total available Score:</span> 
  	     <b tal:content="python: here.getTotalAvailableScore()" />

Index: batch_parent_macros.pt
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/skins/EduploneTest/batch_parent_macros.pt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** batch_parent_macros.pt	5 Oct 2004 18:19:07 -0000	1.2
--- batch_parent_macros.pt	8 Nov 2004 16:34:17 -0000	1.3
***************
*** 98,102 ****
  
                <a href=""
!                  tal:attributes="href python: here.aq_parent.users.absolute_url() + '/' + here.getCurrentUser().id + '/eduplone_userResults'">
  
                   <span i18n:translate="batch_end_item">
--- 98,102 ----
  
                <a href=""
!                  tal:attributes="href python: here.aq_parent.users.absolute_url() + '/' + here.getCurrentUser().id + '/test_environment_feedback'">
  
                   <span i18n:translate="batch_end_item">



-------------------------------------------------------
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