EduploneTest/types EduploneFillGap.py,1.8,1.9 EduploneTestingEnvironment.py,1.16,1.17

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

Modified Files:
	EduploneFillGap.py EduploneTestingEnvironment.py 
Log Message:
c early and often: FreeText in results-overview

Index: EduploneFillGap.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/types/EduploneFillGap.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** EduploneFillGap.py	24 Oct 2004 15:46:05 -0000	1.8
--- EduploneFillGap.py	7 Nov 2004 17:34:02 -0000	1.9
***************
*** 135,150 ****
  				    rendered_text=rendered_text.replace('name="' + i +'"', 'name="' + i + '" value="' + uAnswer[i] + '"')
  				    				    
- 				
  		elif render_as == "tutor":
! 			for i, elem in enumerate(self.text_to_render.replace("\n", " \n").split(" ")):
! 				if elem[:5] == "<gap=" and elem[-1] == ">":
! 					gap_id = re.match(r'<gap=(.*)>', elem).group(1)
! 					#return self[gap_id].Title()
! 					word_to_render = colored_gap % self[gap_id].correctAnswer[0] #Title()
! 					#rendered_text += hyperlink_delete_gap % (gap_id, word_to_render)
! 					rendered_text += hyperlink_edit_gap % (gap_id, word_to_render)
! 				else:
! 					rendered_text += hyperlink_add_gap % (i, elem)
! 			#rendered_text = re.sub(r"<gap=(?P<foo>\w+)>", colored_gap % r"\g<foo>", rendered_text)
  		return rendered_text.replace("\n", "<br />")
  
--- 135,162 ----
  				    rendered_text=rendered_text.replace('name="' + i +'"', 'name="' + i + '" value="' + uAnswer[i] + '"')
  				    				    
  		elif render_as == "tutor":
! 		    for i, elem in enumerate(self.text_to_render.replace("\n", " \n").split(" ")):
! 			if elem[:5] == "<gap=" and elem[-1] == ">":
! 			    gap_id = re.match(r'<gap=(.*)>', elem).group(1)
! 			    #return self[gap_id].Title()
! 			    word_to_render = colored_gap % self[gap_id].correctAnswer[0] #Title()
! 			    #rendered_text += hyperlink_delete_gap % (gap_id, word_to_render)
! 			    rendered_text += hyperlink_edit_gap % (gap_id, word_to_render)
! 			else:
! 			    rendered_text += hyperlink_add_gap % (i, elem)
! 			    #rendered_text = re.sub(r"<gap=(?P<foo>\w+)>", colored_gap % r"\g<foo>", rendered_text)
! 			    
! 		elif render_as =='tutor_noLinks':
! 		    for i, elem in enumerate(self.text_to_render.replace("\n", " \n").split(" ")):
! 			if elem[:5] == "<gap=" and elem[-1] == ">":
! 			    gap_id = re.match(r'<gap=(.*)>', elem).group(1)
! 			    #return self[gap_id].Title()
! 			    word_to_render = colored_gap % self[gap_id].correctAnswer[0] #Title()
! 			    #rendered_text += hyperlink_delete_gap % (gap_id, word_to_render)
! 			    rendered_text += '%s ' % (word_to_render)
! 			else:
! 			    rendered_text += '%s ' % (elem)
! 		    
! 		    
  		return rendered_text.replace("\n", "<br />")
  

Index: EduploneTestingEnvironment.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/types/EduploneTestingEnvironment.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** EduploneTestingEnvironment.py	27 Oct 2004 20:02:12 -0000	1.16
--- EduploneTestingEnvironment.py	7 Nov 2004 17:34:02 -0000	1.17
***************
*** 363,366 ****
--- 363,371 ----
  
          cAnswer=self._getCorrectAnswer(questionId,answerId)
+ 	
+ 	if self[questionId].meta_type=='eduplone SingleChoice':
+ 	    if not self[questionId][answerId].getCorrectAnswer() and not uAnswer in cAnswer: #this answer should not be selected and isn't :
+ 		return 1 #- thats right, then...
+ 		
  
          if uAnswer in cAnswer:
***************
*** 369,378 ****
              return 0
  
!     def evalFreeTextAnswer(self, questionId, uAnswer):
          """ """
!         cAnswer=self._getCorrectAnswer(questionId, questionId)
!         for i in cAnswer:
!             uAnswer=uAnswer.replace(i, '<font color="orange">' + i + '</font>')
!         return uAnswer
  
      def score_CalculateQuestion(self, questionId, userId):
--- 374,398 ----
              return 0
  
! 
!     def evalFreeTextAnswer(self, questionId, uAnswer, detail=0):
          """ """
! 	cAnswer=self._getCorrectAnswer(questionId, questionId)
! 	if detail==0:
!     	    for i in cAnswer:
!         	uAnswer=uAnswer.replace(i, '<font color="orange">' + i + '</font>')
!     	    return uAnswer
! 	elif detail==1 or detail==2:
! 	    ret={}
! 	    for i in cAnswer:	
! 		if i in uAnswer: 
! 		    ret[i]=1
! 		else: ret[i]=0
! 		
!     	    if detail==2:
! 		for AnswerObj in self.filteredAnswerValues(questionId):
! 		    ret[AnswerObj.getId()]=0
! 		    for i in AnswerObj.getCorrectAnswer():
! 			if ret[i]==1:  ret[AnswerObj.getId()]=1
! 	    return ret		
  
      def score_CalculateQuestion(self, questionId, userId):
***************
*** 432,436 ****
              return 0
  
!         print '-NoneText:'
          correctAnswers=0
          for a in possibleAnswers:
--- 452,456 ----
              return 0
  
!         #print '-NoneText:'
          correctAnswers=0
          for a in possibleAnswers:



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