EduploneTest/types EduploneFillGap.py,1.2,1.3 EduploneFillGapAnswer.py,1.2,1.3 EduploneFreeTextAnswer.py,1.2,1.3 EduploneMatchingAnswer.py,1.2,1.3 EduploneMultiChoiceAnswer.py,1.3,1.4 EduploneSingleChoiceAnswer.py,1.2,1.3 EduploneTestMember.py,1.3,1.4 EduploneTestingEnvironment.py,1.4,1.5 EduploneTextTaskAnswer.py,1.2,1.3 EduploneTrueFalseAnswer.py,1.2,1.3

"Radim Novotny \(naro\)" <[email protected]>
Newsgroups gmane.comp.web.zope.eduplone.cvs
Message-ID <[email protected]>
Update of /cvsroot/eduplone/EduploneTest/types
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6319/types

Modified Files:
	EduploneFillGap.py EduploneFillGapAnswer.py 
	EduploneFreeTextAnswer.py EduploneMatchingAnswer.py 
	EduploneMultiChoiceAnswer.py EduploneSingleChoiceAnswer.py 
	EduploneTestMember.py EduploneTestingEnvironment.py 
	EduploneTextTaskAnswer.py EduploneTrueFalseAnswer.py 
Log Message:
added i18n with eduplone domain. Sources translated from German to English

Index: EduploneMultiChoiceAnswer.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/types/EduploneMultiChoiceAnswer.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** EduploneMultiChoiceAnswer.py	29 Sep 2004 11:25:04 -0000	1.3
--- EduploneMultiChoiceAnswer.py	5 Oct 2004 18:19:08 -0000	1.4
***************
*** 25,31 ****
  schema = Schema((
      TextField(
!         'Antwort',
          required=1,
!         widget=TextAreaWidget(description = u"Antwort"),
      ),
        
--- 25,36 ----
  schema = Schema((
      TextField(
!         'Answer',
          required=1,
!         widget=TextAreaWidget(label='Answer',
!                               label_msgid='label_answer',
!                               description = 'Answer - alternative',
!                               description_msgid='help_answer',
!                               i18n_domain='eduplone',
!                              ),
      ),
        
***************
*** 57,60 ****
--- 62,66 ----
      }
  
+     """
      def getAnswer(self):
          #print 'testausgabe',getattr(self,self.Schema()['title'].accessor)()
***************
*** 64,67 ****
                      getFeedback(),\
                      getattr(self,self.Schema()['Image for the question'].accessor)()
! 
  registerType(EduploneMultiChoiceAnswer)
--- 70,73 ----
                      getFeedback(),\
                      getattr(self,self.Schema()['Image for the question'].accessor)()
!     """
  registerType(EduploneMultiChoiceAnswer)

Index: EduploneTestMember.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/types/EduploneTestMember.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** EduploneTestMember.py	4 Oct 2004 18:47:40 -0000	1.3
--- EduploneTestMember.py	5 Oct 2004 18:19:08 -0000	1.4
***************
*** 23,27 ****
  actions = (
             {'id': 'view',
!             'name': 'Auswertung',
              'action': 'string:${object_url}/eduplone_userResults',
              'permissions': (CMFCorePermissions.View,)
--- 23,27 ----
  actions = (
             {'id': 'view',
!             'name': 'Results',
              'action': 'string:${object_url}/eduplone_userResults',
              'permissions': (CMFCorePermissions.View,)
***************
*** 29,33 ****
                         ##should import from TestingEnvironment....
                     {'id': 'students',
! 	            'name': 'Teilnehmer',
  	            'action': 'string:${object_url}/users/eduplone_students',
  	            'permissions': (CMFCorePermissions.View,)
--- 29,33 ----
                         ##should import from TestingEnvironment....
                     {'id': 'students',
! 	            'name': 'Students',
  	            'action': 'string:${object_url}/users/eduplone_students',
  	            'permissions': (CMFCorePermissions.View,)

Index: EduploneMatchingAnswer.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/types/EduploneMatchingAnswer.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EduploneMatchingAnswer.py	29 Sep 2004 11:25:04 -0000	1.2
--- EduploneMatchingAnswer.py	5 Oct 2004 18:19:08 -0000	1.3
***************
*** 28,37 ****
  			'Key (links)',
  			required=1,
! 			widget=StringWidget(description = u"Key"),
  			),
      	BooleanField(
  	    	'Challenge',
  		default=1,
! 	        widget=BooleanWidget(description = u"Show as task on left side?",),
  		),
  	
--- 28,45 ----
  			'Key (links)',
  			required=1,
! 			widget=StringWidget(label = "Key",
!                                                               label_msgid='label_key', 
!                                                               description = "Key", 
!                                                               description_msgid='help_key', 
!                                                               i18n_domain='eduplone'),
  			),
      	BooleanField(
  	    	'Challenge',
  		default=1,
! 	        widget=BooleanWidget(label='Challenge', 
!                                                               label_msgid='label_challenge', 
!                                                               description = "Show as task on left side?", 
!                                                               description_msgid='help_challenge', 
!                                                               i18n_domain='eduplone'),
  		),
  	
***************
*** 58,61 ****
--- 66,70 ----
      }
  
+     """
      def getAnswer(self):
          #print 'testausgabe',getattr(self,self.Schema()['title'].accessor)()
***************
*** 65,68 ****
                      getattr(self,self.Schema()['Feedback'].accessor)(),\
                      getattr(self,self.Schema()['Image for the question'].accessor)()
! 
  registerType(EduploneMatchingAnswer)
--- 74,77 ----
                      getattr(self,self.Schema()['Feedback'].accessor)(),\
                      getattr(self,self.Schema()['Image for the question'].accessor)()
!     """
  registerType(EduploneMatchingAnswer)

Index: EduploneTextTaskAnswer.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/types/EduploneTextTaskAnswer.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EduploneTextTaskAnswer.py	29 Sep 2004 11:25:04 -0000	1.2
--- EduploneTextTaskAnswer.py	5 Oct 2004 18:19:08 -0000	1.3
***************
*** 42,45 ****
--- 42,46 ----
      }
  
+     """
      def getAnswer(self):
          #print 'testausgabe',getattr(self,self.Schema()['title'].accessor)()
***************
*** 49,52 ****
                      getattr(self,self.Schema()['Feedback'].accessor)(),\
                      getattr(self,self.Schema()['Image for the question'].accessor)()
! 
  registerType(EduploneTextTaskAnswer)
--- 50,54 ----
                      getattr(self,self.Schema()['Feedback'].accessor)(),\
                      getattr(self,self.Schema()['Image for the question'].accessor)()
!     """
!     
  registerType(EduploneTextTaskAnswer)

Index: EduploneFillGapAnswer.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/types/EduploneFillGapAnswer.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EduploneFillGapAnswer.py	29 Sep 2004 11:25:04 -0000	1.2
--- EduploneFillGapAnswer.py	5 Oct 2004 18:19:08 -0000	1.3
***************
*** 27,35 ****
      LinesField('correctAnswer',
          required=1,
!         widget=LinesWidget(description = u"Key"),
      ),
      LinesField('Challenges',
      	required=0,
!     	widget=LinesWidget(description = u"Enter the challenges. Each term in one line."),
      ),
  
--- 27,44 ----
      LinesField('correctAnswer',
          required=1,
!         widget=LinesWidget(label = "Key",
!                                                               label_msgid='label_key', 
!                                                               description = "Key", 
!                                                               description_msgid='help_key', 
!                                                               i18n_domain='eduplone'),
! 
      ),
      LinesField('Challenges',
      	required=0,
!     	widget=LinesWidget(             label='Challenges', 
!                                                               label_msgid='label_challenges', 
!                                                               description = "Enter the challenges. Each term in one line.", 
!                                                               description_msgid='help_challenges', 
!                                                               i18n_domain='eduplone'),
      ),
  
***************
*** 40,44 ****
  
  
! 
  class EduploneFillGapAnswer(BaseContent):
      """ An answer for eduplone """
--- 49,53 ----
  
  
!         
  class EduploneFillGapAnswer(BaseContent):
      """ An answer for eduplone """
***************
*** 55,58 ****
--- 64,68 ----
      }
  
+     """
      def getAnswer(self):
          #print 'testausgabe',getattr(self,self.Schema()['title'].accessor)()
***************
*** 62,65 ****
                      getattr(self,self.Schema()['Feedback'].accessor)(),\
                      getattr(self,self.Schema()['Image for the question'].accessor)()
! 
  registerType(EduploneFillGapAnswer)
--- 72,76 ----
                      getattr(self,self.Schema()['Feedback'].accessor)(),\
                      getattr(self,self.Schema()['Image for the question'].accessor)()
!     """
!     
  registerType(EduploneFillGapAnswer)

Index: EduploneFreeTextAnswer.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/types/EduploneFreeTextAnswer.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EduploneFreeTextAnswer.py	29 Sep 2004 11:25:04 -0000	1.2
--- EduploneFreeTextAnswer.py	5 Oct 2004 18:19:08 -0000	1.3
***************
*** 42,45 ****
--- 42,46 ----
      }
  
+     """
      def getAnswer(self):
          #print 'testausgabe',getattr(self,self.Schema()['title'].accessor)()
***************
*** 49,52 ****
                      getattr(self,self.Schema()['Feedback'].accessor)(),\
                      getattr(self,self.Schema()['Image for the question'].accessor)()
! 
  registerType(EduploneFreeTextAnswer)
--- 50,53 ----
                      getattr(self,self.Schema()['Feedback'].accessor)(),\
                      getattr(self,self.Schema()['Image for the question'].accessor)()
!     """
  registerType(EduploneFreeTextAnswer)

Index: EduploneFillGap.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/types/EduploneFillGap.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EduploneFillGap.py	29 Sep 2004 11:25:04 -0000	1.2
--- EduploneFillGap.py	5 Oct 2004 18:19:08 -0000	1.3
***************
*** 33,49 ****
  		ScoreField,
  		StringField('task_type',
! 			label="Art",
  			required=1,
  			vocabulary=['Text', 'Dropdown'],
! 			widget=SelectionWidget(description="Either text or dropdown."),
  		),
  		StringField('text_to_render',
- 			label="Lueckentext",
  			required=1,
! 			widget=TextAreaWidget(description = u""),
! 		),
! #        LevelField,
! #        MediatypeField('document')
! 		),
  	marshall=PrimaryFieldMarshaller(),
  )
--- 33,52 ----
  		ScoreField,
  		StringField('task_type',
! # 			label="Art",
  			required=1,
  			vocabulary=['Text', 'Dropdown'],
! 			widget=SelectionWidget(label="Task type"),
!                                                               label_msgid='label_text_or_dropdown', 
!                                                               description = "Either text or dropdown.", 
!                                                               description_msgid='help_text_or_dropdown', 
!                                                               i18n_domain='eduplone'),
  		),
  		StringField('text_to_render',
  			required=1,
! 			widget=TextAreaWidget(label="Text to enter",
!                                                               label_msgid='label_text_to _enter', 
!                                                               i18n_domain='eduplone'
!                                         ),
!               ),
  	marshall=PrimaryFieldMarshaller(),
  )
***************
*** 158,160 ****
  		return rendered_text.replace("\n", "<br />")
  
! registerType(EduploneFillGap)
\ No newline at end of file
--- 161,163 ----
  		return rendered_text.replace("\n", "<br />")
  
! registerType(EduploneFillGap)

Index: EduploneTestingEnvironment.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/types/EduploneTestingEnvironment.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** EduploneTestingEnvironment.py	4 Oct 2004 18:47:40 -0000	1.4
--- EduploneTestingEnvironment.py	5 Oct 2004 18:19:08 -0000	1.5
***************
*** 39,53 ****
              },
             {'id': 'view',
!             'name': 'KlausurStartseite',
              'action': 'string:${object_url}/test_environment_listing',
              'permissions': (CMFCorePermissions.View,)
              },
             {'id': 'students',
!             'name': 'Teilnehmer',
              'action': 'string:${object_url}/users/eduplone_students',
              'permissions': (CMFCorePermissions.View,)
              },
             {'id': 'testingResults',
!             'name': 'Auswertung',
              'action': 'string:${object_url}/eduplone_testingResults',
              'permissions': (CMFCorePermissions.View,)
--- 39,53 ----
              },
             {'id': 'view',
!             'name': 'View',
              'action': 'string:${object_url}/test_environment_listing',
              'permissions': (CMFCorePermissions.View,)
              },
             {'id': 'students',
!             'name': 'Students',
              'action': 'string:${object_url}/users/eduplone_students',
              'permissions': (CMFCorePermissions.View,)
              },
             {'id': 'testingResults',
!             'name': 'Results',
              'action': 'string:${object_url}/eduplone_testingResults',
              'permissions': (CMFCorePermissions.View,)
***************
*** 68,114 ****
          required=1,
          searchable = 1,
!         widget=TextAreaWidget(label = u"Beschreibung",
!                               description = u"Beschreibung der Klausur"),
! 	#schemata='Description'
      ),
      BooleanField(
          'public',
          default = 0,
!         widget = BooleanWidget(label = u"Klausur öffentlich",
!                                description = u"Jeder registrierte Benutzer kann an der Klausur teilnehmen."),
! 	#schemata='Description'
      ),
      BooleanField(
          'showpoints',
          default = 0,
!         widget = BooleanWidget(label = u"Punkte zeigen",
!                                description = u"Erreichbare Punkte anzeigen."),
! #	schemata='Description'
      ),
      BooleanField(
          'showresults',
          default = 0,
!         widget = BooleanWidget(label = u"Ergebnis zeigen",
!                                description = u"Endergebnis fuer den Benutzer sichtbar."),
! #	schemata='Flow'
      ),
      BooleanField(
          'verifymembership',
          default = 1,
!         widget = BooleanWidget(label = u"Benutzer bestätigen",
!                                description = u"Benutzer die sich selbst eingetragen haben, muessen erst vom Tutor bestaetigt werden (nur wenn Klausur oeffentlich ist)."),
! 	#schemata='Flow'
      ),
      DateTimeField(
          'starttime',
!         widget = CalendarWidget(label = "Starttermin",
!                                 description = "Klausur startet zu diesem Zeitpunkt."),
! 	#schemata='Flow'
      ),
      DateTimeField(
          'stoptime',
!         widget = CalendarWidget(label = "Endtermin",
!                                 description = "Klausur endet zu diesem Zeitpunkt."),
! 	#schemata='Flow'
      ),
      ),
--- 68,135 ----
          required=1,
          searchable = 1,
!         widget=TextAreaWidget(label = u"Description",
!                               label_msgid='label_test_description',
!                               description = u"Exam description",
!                               description_msgid='help_test_description',
!                               i18n_domain='eduplone'),
!         #schemata='Description'
      ),
      BooleanField(
          'public',
          default = 0,
!         widget = BooleanWidget(label = "Public test",
!                                label_msgid='label_public_test',
!                                description = 'Registered portal member can participate in the test',
!                                description_msgid='help_public_test',
!                                i18n_domain='eduplone'),
!         #schemata='Description'
      ),
      BooleanField(
          'showpoints',
          default = 0,
!         widget = BooleanWidget(label = "Show score",
!                                label_msgid='label_show_score',
!                                description = "Show the maximum points achievable",
!                                description_msgid='help_show_score',
!                                i18n_domain='eduplone'),
! #       schemata='Description'
      ),
      BooleanField(
          'showresults',
          default = 0,
!         widget = BooleanWidget(label = u"Show the result",
!                                label_msgid='label_show_results',
!                                description = u"Final result visible to the user",
!                                description_msgid='help_show_results',
!                                i18n_domain='eduplone'),
! #       schemata='Flow'
      ),
      BooleanField(
          'verifymembership',
          default = 1,
!         widget = BooleanWidget(label = "Confirm the user",
!                                label_msgid='label_validate_users',
!                                description = "Users that listed them themselves have first to be confirmed by the teacher (only for a public test)",
!                                description_msgid='help_validate_users',
!                                i18n_domain='eduplone'),
!         #schemata='Flow'
      ),
      DateTimeField(
          'starttime',
!         widget = CalendarWidget(label = "Start date",
!                                 label_msgid='label_start_date',
!                                 description = "The test starts at",
!                                 description_msgid='help_start_date',
!                                 i18n_domain='eduplone'),
!         #schemata='Flow'
      ),
      DateTimeField(
          'stoptime',
!         widget = CalendarWidget(label = "End date",
!                                 label_msgid='label_end_date',
!                                 description = "The test ends at",
!                                 description_msgid='help_end_date',
!                                 i18n_domain='eduplone'),
!         #schemata='Flow'
      ),
      ),
***************
*** 220,224 ****
              del REQUEST.form['qId']
              if user in self['users'].objectIds():  # diese abfrage ueber vorhandene Funktionen loesen! ist die berhaupt noetig?
! 		self.users[user]._saveQuestionAnswers(user, questionid, REQUEST.form)
              #return self.view()
  
--- 241,245 ----
              del REQUEST.form['qId']
              if user in self['users'].objectIds():  # diese abfrage ueber vorhandene Funktionen loesen! ist die berhaupt noetig?
!                 self.users[user]._saveQuestionAnswers(user, questionid, REQUEST.form)
              #return self.view()
  
***************
*** 229,233 ****
          self.saveQuestionAnswers(REQUEST)
          nextId=self.sequence_getNext(questionid)
! 	if nextId not in  ['users', -1]:
              return self[self.sequence_getNext(questionid)].view()
          else:
--- 250,254 ----
          self.saveQuestionAnswers(REQUEST)
          nextId=self.sequence_getNext(questionid)
!         if nextId not in  ['users', -1]:
              return self[self.sequence_getNext(questionid)].view()
          else:
***************
*** 235,239 ****
                  #if self.show_results.....
                  #return self.users[self.eduplone_userResults(getCurrentUser.getId())
! 		return self.REQUEST.response.redirect(self.users[self.getCurrentUser().getId()].absolute_url() + '/eduplone_userResults')
              return self.sequence_getNext(questionid)
  
--- 256,260 ----
                  #if self.show_results.....
                  #return self.users[self.eduplone_userResults(getCurrentUser.getId())
!                 return self.REQUEST.response.redirect(self.users[self.getCurrentUser().getId()].absolute_url() + '/eduplone_userResults')
              return self.sequence_getNext(questionid)
  
***************
*** 245,249 ****
             possible/correct answers"""
  
! 	#what about text-task // free-text
          result=[]
          for objAnswer in self[questionId].objectValues():
--- 266,270 ----
             possible/correct answers"""
  
!         #what about text-task // free-text
          result=[]
          for objAnswer in self[questionId].objectValues():
***************
*** 275,322 ****
          result={}
  
! 	for objAnswer in self._filteredAnswerValues(questionId):
              cAnswer=objAnswer.getCorrectAnswer()
              if cAnswer not in [None, '']:
                  #if type(cAnswer) != []:cAnswer=[cAnswer]
! 		if objAnswer.meta_type=='eduplone SingleChoiceAnswer' and objAnswer.getCorrectAnswer()==True:
! 		    result[objAnswer.getId()]=objAnswer.getId()
! 		else:
                      result[objAnswer.getId()]=cAnswer
          return result
  
      def _getCorrectAnswer(self, questionId, answerId):
! 	""" """
! 	objQ=self[questionId]
! 	objA=self[questionId][answerId]
! 	mType=objQ.meta_type
  
! 	#the evil typeswitch....
! 	cAnswer=[]
! 	
! 	#if mType in ['eduplone FillGap']:
! 	#    if objQ.getTask_type()=='Dropdown':
! 	#	mType='eduplone Matching'
! 	#    else: 
! 	#    	mType=TextTask       
! 	#	return []
  
! 	if mType in ['eduplone SingleChoice']: #SingleChoice requires id of answer as uAnswer
! 	    cAnswer.append(objA.getId())
  
! 	if mType in ['eduplone MultiChoice', 'eduplone Matching', 'eduplone TrueFalse']: #MultiChoice requires id of answer as uAnswer
! 	    cAnswer.append(str(objA.getCorrectAnswer()))
  
! 	if mType in ['eduplone TextTask', 'eduplone FillGap']:
! 	    if type(objA.getCorrectAnswer())==type(''):
! 		cAnswer.append(objA.getCorrectAnswer)
! 	    else:
! 		cAnswer=objA.getCorrectAnswer()
! 	
! 	if mType in ['eduplone FreeText']:
! 	    for i in objQ.objectValues():
! 		for ii in i.getCorrectAnswer():
! 		    cAnswer.append(ii)
!         
! 	return cAnswer
  
      def evalAnswer(self, questionId, answerId, uAnswer):
--- 296,343 ----
          result={}
  
!         for objAnswer in self._filteredAnswerValues(questionId):
              cAnswer=objAnswer.getCorrectAnswer()
              if cAnswer not in [None, '']:
                  #if type(cAnswer) != []:cAnswer=[cAnswer]
!                 if objAnswer.meta_type=='eduplone SingleChoiceAnswer' and objAnswer.getCorrectAnswer()==True:
!                     result[objAnswer.getId()]=objAnswer.getId()
!                 else:
                      result[objAnswer.getId()]=cAnswer
          return result
  
      def _getCorrectAnswer(self, questionId, answerId):
!         """ """
!         objQ=self[questionId]
!         objA=self[questionId][answerId]
!         mType=objQ.meta_type
  
!         #the evil typeswitch....
!         cAnswer=[]
  
!         #if mType in ['eduplone FillGap']:
!         #    if objQ.getTask_type()=='Dropdown':
!         #       mType='eduplone Matching'
!         #    else:
!         #       mType=TextTask
!         #       return []
  
!         if mType in ['eduplone SingleChoice']: #SingleChoice requires id of answer as uAnswer
!             cAnswer.append(objA.getId())
  
!         if mType in ['eduplone MultiChoice', 'eduplone Matching', 'eduplone TrueFalse']: #MultiChoice requires id of answer as uAnswer
!             cAnswer.append(str(objA.getCorrectAnswer()))
! 
!         if mType in ['eduplone TextTask', 'eduplone FillGap']:
!             if type(objA.getCorrectAnswer())==type(''):
!                 cAnswer.append(objA.getCorrectAnswer)
!             else:
!                 cAnswer=objA.getCorrectAnswer()
! 
!         if mType in ['eduplone FreeText']:
!             for i in objQ.objectValues():
!                 for ii in i.getCorrectAnswer():
!                     cAnswer.append(ii)
! 
!         return cAnswer
  
      def evalAnswer(self, questionId, answerId, uAnswer):
***************
*** 325,334 ****
          """
          if uAnswer == 'on' : uAnswer = 'True'#1 #checkboxes....
! 	if uAnswer == 'off' or uAnswer =='' : uAnswer = 'False'
  
          cAnswer=self._getCorrectAnswer(questionId,answerId)
  
! 	if uAnswer in cAnswer:
! 	    return 1
          else:
              return 0
--- 346,355 ----
          """
          if uAnswer == 'on' : uAnswer = 'True'#1 #checkboxes....
!         if uAnswer == 'off' or uAnswer =='' : uAnswer = 'False'
  
          cAnswer=self._getCorrectAnswer(questionId,answerId)
  
!         if uAnswer in cAnswer:
!             return 1
          else:
              return 0
***************
*** 337,343 ****
      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
  
--- 358,364 ----
      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
  
***************
*** 350,392 ****
              (ScoreTotal / Alternatives) * CorrectAnswers
          """
! 	if self.users[userId]._scoreOverride.has_key(questionId):
! 	    return self.users[userId]._scoreOverride[questionId]
  
          questionScore=self[questionId].getScore()
! 	possibleAnswers=self._filteredAnswerValues(questionId)
! 	
! 	if len(possibleAnswers)==0 :
! 	    print 'no Answers for qID ' + questionId
! 	    return 0 #wo nix is, kan man auch nix auswerten....
  
- 	uAnswer=self.users[userId].getAnswer(questionId)
- 	
- 	
          if self[questionId].meta_type in ['eduplone TextTask']:#, 'eduplone FreeText']: #take FreeText out!
! 	    print '-TextTask:'
! 	    if uAnswer.has_key(questionId):
! 		uAnswer=uAnswer[questionId]
! 		if self.evalAnswer(questionId, possibleAnswers[0].getId(), uAnswer):
! 		    return questionScore
! 		
! 	    return 0
! 	    
! 	if self[questionId].meta_type in ['eduplone FreeText']:
! 	    print '-FreeText'
! 	    #alle begriffe muessen enthalten sein:
! 	        
! 	    
! 	if self[questionId].meta_type in ['eduplone SingleChoice']:
! 	    print '-SingleChoice'
! 	    if uAnswer.has_key(questionId):
!     		if self[questionId][uAnswer[questionId]].getCorrectAnswer()==1: return questionScore
! 	    return 0
! 	    
! 	print '-NoneText:'
!     	correctAnswers=0
!     	for a in possibleAnswers:
! 	    uAnswer=self.users[userId].getSingleAnswer(questionId, a.getId())
!     	    if self.evalAnswer(questionId, a.getId(), uAnswer):
!         	correctAnswers +=1
  
          wrongAnswers=len(possibleAnswers)-correctAnswers
--- 371,413 ----
              (ScoreTotal / Alternatives) * CorrectAnswers
          """
!         if self.users[userId]._scoreOverride.has_key(questionId):
!             return self.users[userId]._scoreOverride[questionId]
  
          questionScore=self[questionId].getScore()
!         possibleAnswers=self._filteredAnswerValues(questionId)
! 
!         if len(possibleAnswers)==0 :
!             print 'no Answers for qID ' + questionId
!             return 0 #wo nix is, kan man auch nix auswerten....
! 
!         uAnswer=self.users[userId].getAnswer(questionId)
! 
  
          if self[questionId].meta_type in ['eduplone TextTask']:#, 'eduplone FreeText']: #take FreeText out!
!             print '-TextTask:'
!             if uAnswer.has_key(questionId):
!                 uAnswer=uAnswer[questionId]
!                 if self.evalAnswer(questionId, possibleAnswers[0].getId(), uAnswer):
!                     return questionScore
! 
!             return 0
! 
!         if self[questionId].meta_type in ['eduplone FreeText']:
!             print '-FreeText'
!             #alle begriffe muessen enthalten sein:
! 
! 
!         if self[questionId].meta_type in ['eduplone SingleChoice']:
!             print '-SingleChoice'
!             if uAnswer.has_key(questionId):
!                 if self[questionId][uAnswer[questionId]].getCorrectAnswer()==1: return questionScore
!             return 0
! 
!         print '-NoneText:'
!         correctAnswers=0
!         for a in possibleAnswers:
!             uAnswer=self.users[userId].getSingleAnswer(questionId, a.getId())
!             if self.evalAnswer(questionId, a.getId(), uAnswer):
!                 correctAnswers +=1
  
          wrongAnswers=len(possibleAnswers)-correctAnswers

Index: EduploneSingleChoiceAnswer.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/types/EduploneSingleChoiceAnswer.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EduploneSingleChoiceAnswer.py	29 Sep 2004 11:25:04 -0000	1.2
--- EduploneSingleChoiceAnswer.py	5 Oct 2004 18:19:08 -0000	1.3
***************
*** 26,36 ****
  schema = Schema((
      TextField(
!     	'Antwort',
          required=1,
!         widget=TextAreaWidget(description = u"Antwort-Alternative"),
      ),
! 	  
! 	(CORRECT_ANSWER_FIELD['SingleChoice']),
!     
  #    ImageField('Illustrating image',
  #        widget=ImageWidget(description = "Select the image to be added by clicking the 'Browse' button.",
--- 26,40 ----
  schema = Schema((
      TextField(
!         'Answer',
          required=1,
!         widget=TextAreaWidget(description = u"Answer-alternative",
!                                                         label='Answer',
!                                                         label_msgid='label_answer',
!                                                         description_msgid='help_description',
!                                                         i18n_domain='eduplone'),
      ),
! 
!         (CORRECT_ANSWER_FIELD['SingleChoice']),
! 
  #    ImageField('Illustrating image',
  #        widget=ImageWidget(description = "Select the image to be added by clicking the 'Browse' button.",
***************
*** 39,43 ****
  #        label_msgid = "label_image")
  #    ),
!     ),        
      marshall=PrimaryFieldMarshaller(),
  )
--- 43,47 ----
  #        label_msgid = "label_image")
  #    ),
!     ),
      marshall=PrimaryFieldMarshaller(),
  )
***************
*** 58,63 ****
--- 62,69 ----
      }
  
+     """
      def getAnswer(self):
          #print 'testausgabe',getattr(self,self.Schema()['title'].accessor)()
+ 	import pdb; pdb.set_trace()
          return getattr(self,self.Schema()['title'].accessor)(),\
                      getattr(self,self.Schema()['Answer for the question'].accessor)(),\
***************
*** 65,68 ****
                      getattr(self,self.Schema()['Feedback'].accessor)(),\
                      getattr(self,self.Schema()['Image for the question'].accessor)()
! 
  registerType(EduploneSingleChoiceAnswer)
--- 71,74 ----
                      getattr(self,self.Schema()['Feedback'].accessor)(),\
                      getattr(self,self.Schema()['Image for the question'].accessor)()
!     """
  registerType(EduploneSingleChoiceAnswer)

Index: EduploneTrueFalseAnswer.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/types/EduploneTrueFalseAnswer.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EduploneTrueFalseAnswer.py	29 Sep 2004 11:25:04 -0000	1.2
--- EduploneTrueFalseAnswer.py	5 Oct 2004 18:19:08 -0000	1.3
***************
*** 25,35 ****
  schema = Schema((
      TextField(
!     	'Antwort',
          required=1,
!         widget=TextAreaWidget(description = u"Antwort-Alternative"),
      ),
! 	  
! 	CORRECT_ANSWER_FIELD['TrueFalse']
!     
  #    ImageField('Illustrating image',
  #        widget=ImageWidget(description = "Select the image to be added by clicking the 'Browse' button.",
--- 25,40 ----
  schema = Schema((
      TextField(
!         'Answer',
          required=1,
!         widget=TextAreaWidget(label='Answer',
!                               label_msgid='label_answer',
!                               description = 'Answer - alternative',
!                               description_msgid='help_answer',
!                               i18n_domain='eduplone',
!                              ),
      ),
! 
!         CORRECT_ANSWER_FIELD['TrueFalse']
! 
  #    ImageField('Illustrating image',
  #        widget=ImageWidget(description = "Select the image to be added by clicking the 'Browse' button.",
***************
*** 38,42 ****
  #        label_msgid = "label_image")
  #    ),
!     ),        
      marshall=PrimaryFieldMarshaller(),
  )
--- 43,47 ----
  #        label_msgid = "label_image")
  #    ),
!     ),
      marshall=PrimaryFieldMarshaller(),
  )
***************
*** 57,67 ****
      }
  
      def getAnswer(self):
          #print 'testausgabe',getattr(self,self.Schema()['title'].accessor)()
!         return getTitle(),\
                      getattr(self,self.Schema()['Answer for the question'].accessor)(),\
                      getattr(self,self.Schema()['Answer correct?'].accessor)(),\
                      getattr(self,self.Schema()['Feedback'].accessor)(),\
                      getattr(self,self.Schema()['Image for the question'].accessor)()
! 
  registerType(EduploneTrueFalseAnswer)
--- 62,75 ----
      }
  
+     """
      def getAnswer(self):
          #print 'testausgabe',getattr(self,self.Schema()['title'].accessor)()
!         import pdb; pdb.set_trace()
!         return self.Title(),\
                      getattr(self,self.Schema()['Answer for the question'].accessor)(),\
                      getattr(self,self.Schema()['Answer correct?'].accessor)(),\
                      getattr(self,self.Schema()['Feedback'].accessor)(),\
                      getattr(self,self.Schema()['Image for the question'].accessor)()
!     """
!     
  registerType(EduploneTrueFalseAnswer)



-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.