EduploneExam/answers BlindGapAnswer.py,1.20,1.21 BooleanAnswer.py,1.19,1.20 ChoiceGapAnswer.py,1.20,1.21 FreeTextAnswer.py,1.21,1.22 MatchingAnswer.py,1.21,1.22 MathAnswer.py,1.22,1.23 MultipleChoiceAnswer.py,1.19,1.20 SingleChoiceAnswer.py,1.19,1.20 TextLineAnswer.py,1.16,1.17 TextTaskAnswer.py,1.20,1.21 TrueFalseAnswer.py,1.19,1.20

Nils Haagen <[email protected]> Mon, 10 Jan 2005 12:49:20 +0000
Newsgroups gmane.comp.web.zope.eduplone.cvs
Message-ID <[email protected]>
Update of /cvsroot/eduplone/EduploneExam/answers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12082/answers

Modified Files:
	BlindGapAnswer.py BooleanAnswer.py ChoiceGapAnswer.py 
	FreeTextAnswer.py MatchingAnswer.py MathAnswer.py 
	MultipleChoiceAnswer.py SingleChoiceAnswer.py 
	TextLineAnswer.py TextTaskAnswer.py TrueFalseAnswer.py 
Log Message:
umlaute working now; removed matching-doublets

Index: TrueFalseAnswer.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/answers/TrueFalseAnswer.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** TrueFalseAnswer.py	18 Dec 2004 14:04:22 -0000	1.19
--- TrueFalseAnswer.py	10 Jan 2005 12:49:18 -0000	1.20
***************
*** 5,12 ****
  RCS-ID $Id$
  """
! # Copyright (c) 2004 by eduplone Open Source Business Network EEIG, contributed
  # by FH-Aargau, Switzerland
  #
! # Generated: Sat Dec 18 14:43:46 2004
  # Generator: ArchGenXML Version 1.2 devel 3 http://sf.net/projects/archetypes/
  #
--- 5,12 ----
  RCS-ID $Id$
  """
! # Copyright (c) 2005 by eduplone Open Source Business Network EEIG, contributed
  # by FH-Aargau, Switzerland
  #
! # Generated: Mon Jan 10 11:01:26 2005
  # Generator: ArchGenXML Version 1.2 devel 3 http://sf.net/projects/archetypes/
  #

Index: TextLineAnswer.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/answers/TextLineAnswer.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** TextLineAnswer.py	27 Dec 2004 14:22:43 -0000	1.16
--- TextLineAnswer.py	10 Jan 2005 12:49:18 -0000	1.17
***************
*** 5,12 ****
  RCS-ID $Id$
  """
! # Copyright (c) 2004 by eduplone Open Source Business Network EEIG, contributed
  # by FH-Aargau, Switzerland
  #
! # Generated: Sat Dec 18 14:43:46 2004
  # Generator: ArchGenXML Version 1.2 devel 3 http://sf.net/projects/archetypes/
  #
--- 5,12 ----
  RCS-ID $Id$
  """
! # Copyright (c) 2005 by eduplone Open Source Business Network EEIG, contributed
  # by FH-Aargau, Switzerland
  #
! # Generated: Mon Jan 10 11:01:27 2005
  # Generator: ArchGenXML Version 1.2 devel 3 http://sf.net/projects/archetypes/
  #
***************
*** 105,109 ****
          if not self.caseSensitive:
              li=[]
!             for i in self.correct:
                  li.append(i.lower())
              
--- 105,109 ----
          if not self.caseSensitive:
              li=[]
!             for i in self.getCorrect():
                  li.append(i.lower())
              
***************
*** 111,115 ****
              
          else:
!             li=self.correct
  
              
--- 111,115 ----
              
          else:
!             li=self.getCorrect()
  
              

Index: MultipleChoiceAnswer.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/answers/MultipleChoiceAnswer.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** MultipleChoiceAnswer.py	18 Dec 2004 14:04:22 -0000	1.19
--- MultipleChoiceAnswer.py	10 Jan 2005 12:49:18 -0000	1.20
***************
*** 5,12 ****
  RCS-ID $Id$
  """
! # Copyright (c) 2004 by eduplone Open Source Business Network EEIG, contributed
  # by FH-Aargau, Switzerland
  #
! # Generated: Sat Dec 18 14:43:46 2004
  # Generator: ArchGenXML Version 1.2 devel 3 http://sf.net/projects/archetypes/
  #
--- 5,12 ----
  RCS-ID $Id$
  """
! # Copyright (c) 2005 by eduplone Open Source Business Network EEIG, contributed
  # by FH-Aargau, Switzerland
  #
! # Generated: Mon Jan 10 11:01:26 2005
  # Generator: ArchGenXML Version 1.2 devel 3 http://sf.net/projects/archetypes/
  #

Index: FreeTextAnswer.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/answers/FreeTextAnswer.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** FreeTextAnswer.py	18 Dec 2004 14:04:22 -0000	1.21
--- FreeTextAnswer.py	10 Jan 2005 12:49:18 -0000	1.22
***************
*** 5,12 ****
  RCS-ID $Id$
  """
! # Copyright (c) 2004 by eduplone Open Source Business Network EEIG, contributed
  # by FH-Aargau, Switzerland
  #
! # Generated: Sat Dec 18 14:43:46 2004
  # Generator: ArchGenXML Version 1.2 devel 3 http://sf.net/projects/archetypes/
  #
--- 5,12 ----
  RCS-ID $Id$
  """
! # Copyright (c) 2005 by eduplone Open Source Business Network EEIG, contributed
  # by FH-Aargau, Switzerland
  #
! # Generated: Mon Jan 10 11:01:27 2005
  # Generator: ArchGenXML Version 1.2 devel 3 http://sf.net/projects/archetypes/
  #

Index: ChoiceGapAnswer.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/answers/ChoiceGapAnswer.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** ChoiceGapAnswer.py	18 Dec 2004 14:04:22 -0000	1.20
--- ChoiceGapAnswer.py	10 Jan 2005 12:49:18 -0000	1.21
***************
*** 5,12 ****
  RCS-ID $Id$
  """
! # Copyright (c) 2004 by eduplone Open Source Business Network EEIG, contributed
  # by FH-Aargau, Switzerland
  #
! # Generated: Sat Dec 18 14:43:46 2004
  # Generator: ArchGenXML Version 1.2 devel 3 http://sf.net/projects/archetypes/
  #
--- 5,12 ----
  RCS-ID $Id$
  """
! # Copyright (c) 2005 by eduplone Open Source Business Network EEIG, contributed
  # by FH-Aargau, Switzerland
  #
! # Generated: Mon Jan 10 11:01:26 2005
  # Generator: ArchGenXML Version 1.2 devel 3 http://sf.net/projects/archetypes/
  #
***************
*** 100,104 ****
          
          '''
!         if value and value == self.correct:
              return True
          else:
--- 100,104 ----
          
          '''
!         if value and value == self.getCorrect():
              return True
          else:

Index: TextTaskAnswer.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/answers/TextTaskAnswer.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** TextTaskAnswer.py	18 Dec 2004 14:04:22 -0000	1.20
--- TextTaskAnswer.py	10 Jan 2005 12:49:18 -0000	1.21
***************
*** 5,12 ****
  RCS-ID $Id$
  """
! # Copyright (c) 2004 by eduplone Open Source Business Network EEIG, contributed
  # by FH-Aargau, Switzerland
  #
! # Generated: Sat Dec 18 14:43:46 2004
  # Generator: ArchGenXML Version 1.2 devel 3 http://sf.net/projects/archetypes/
  #
--- 5,12 ----
  RCS-ID $Id$
  """
! # Copyright (c) 2005 by eduplone Open Source Business Network EEIG, contributed
  # by FH-Aargau, Switzerland
  #
! # Generated: Mon Jan 10 11:01:27 2005
  # Generator: ArchGenXML Version 1.2 devel 3 http://sf.net/projects/archetypes/
  #

Index: MathAnswer.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/answers/MathAnswer.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** MathAnswer.py	18 Dec 2004 14:04:22 -0000	1.22
--- MathAnswer.py	10 Jan 2005 12:49:18 -0000	1.23
***************
*** 5,12 ****
  RCS-ID $Id$
  """
! # Copyright (c) 2004 by eduplone Open Source Business Network EEIG, contributed
  # by FH-Aargau, Switzerland
  #
! # Generated: Sat Dec 18 14:43:46 2004
  # Generator: ArchGenXML Version 1.2 devel 3 http://sf.net/projects/archetypes/
  #
--- 5,12 ----
  RCS-ID $Id$
  """
! # Copyright (c) 2005 by eduplone Open Source Business Network EEIG, contributed
  # by FH-Aargau, Switzerland
  #
! # Generated: Mon Jan 10 11:01:27 2005
  # Generator: ArchGenXML Version 1.2 devel 3 http://sf.net/projects/archetypes/
  #
***************
*** 100,104 ****
          
          '''
!         range = (self.correct-self.tolerance, self.correct+self.tolerance)
          if value and float(value) and float(value) >= range[0] and float(value) <= range[1] :
              return True
--- 100,109 ----
          
          '''
!         range = (self.getCorrect()-self.getTolerance(), self.getCorrect()+self.getTolerance())
!         print range
!         print value
!         #print float(value) >= range[0] 
!         #print float(value) <= range[1]
!         
          if value and float(value) and float(value) >= range[0] and float(value) <= range[1] :
              return True

Index: MatchingAnswer.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/answers/MatchingAnswer.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** MatchingAnswer.py	18 Dec 2004 14:04:22 -0000	1.21
--- MatchingAnswer.py	10 Jan 2005 12:49:18 -0000	1.22
***************
*** 5,12 ****
  RCS-ID $Id$
  """
! # Copyright (c) 2004 by eduplone Open Source Business Network EEIG, contributed
  # by FH-Aargau, Switzerland
  #
! # Generated: Sat Dec 18 14:43:46 2004
  # Generator: ArchGenXML Version 1.2 devel 3 http://sf.net/projects/archetypes/
  #
--- 5,12 ----
  RCS-ID $Id$
  """
! # Copyright (c) 2005 by eduplone Open Source Business Network EEIG, contributed
  # by FH-Aargau, Switzerland
  #
! # Generated: Mon Jan 10 11:01:27 2005
  # Generator: ArchGenXML Version 1.2 devel 3 http://sf.net/projects/archetypes/
  #
***************
*** 72,75 ****
--- 72,84 ----
          ),
          
+         StringField('correct',
+             widget=StringWidget(description='Enter a value for correct.',
+                 description_msgid='EduploneExam_help_correct',
+                 i18n_domain='EduploneExam',
+                 label='Correct',
+                 label_msgid='EduploneExam_label_correct',
+             ),
+         ),
+         
          StringField('challange',
              widget=StringWidget(description='Enter a value for challange.',
***************
*** 91,103 ****
          ),
          
-         StringField('correct',
-             widget=StringWidget(description='Enter a value for correct.',
-                 description_msgid='EduploneExam_help_correct',
-                 i18n_domain='EduploneExam',
-                 label='Correct',
-                 label_msgid='EduploneExam_label_correct',
-             ),
-         ),
-         
      ),
      )
--- 100,103 ----
***************
*** 110,114 ****
          
          '''
!         if value and value == self.correct:
              return True
          else:
--- 110,114 ----
          
          '''
!         if value and value == self.getCorrect():
              return True
          else:

Index: BooleanAnswer.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/answers/BooleanAnswer.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** BooleanAnswer.py	18 Dec 2004 14:04:22 -0000	1.19
--- BooleanAnswer.py	10 Jan 2005 12:49:18 -0000	1.20
***************
*** 5,12 ****
  RCS-ID $Id$
  """
! # Copyright (c) 2004 by eduplone Open Source Business Network EEIG, contributed
  # by FH-Aargau, Switzerland
  #
! # Generated: Sat Dec 18 14:43:46 2004
  # Generator: ArchGenXML Version 1.2 devel 3 http://sf.net/projects/archetypes/
  #
--- 5,12 ----
  RCS-ID $Id$
  """
! # Copyright (c) 2005 by eduplone Open Source Business Network EEIG, contributed
  # by FH-Aargau, Switzerland
  #
! # Generated: Mon Jan 10 11:01:27 2005
  # Generator: ArchGenXML Version 1.2 devel 3 http://sf.net/projects/archetypes/
  #
***************
*** 118,122 ****
          '''
  
!         return self.id
  
      #methods from Interface IExamAnswer
--- 118,122 ----
          '''
  
!         return self.getId()
  
      #methods from Interface IExamAnswer
***************
*** 136,140 ****
              value=False
  
!         return self.correct==value
  
  
--- 136,140 ----
              value=False
  
!         return self.getCorrect()==value
  
  

Index: SingleChoiceAnswer.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/answers/SingleChoiceAnswer.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** SingleChoiceAnswer.py	18 Dec 2004 14:04:22 -0000	1.19
--- SingleChoiceAnswer.py	10 Jan 2005 12:49:18 -0000	1.20
***************
*** 5,12 ****
  RCS-ID $Id$
  """
! # Copyright (c) 2004 by eduplone Open Source Business Network EEIG, contributed
  # by FH-Aargau, Switzerland
  #
! # Generated: Sat Dec 18 14:43:46 2004
  # Generator: ArchGenXML Version 1.2 devel 3 http://sf.net/projects/archetypes/
  #
--- 5,12 ----
  RCS-ID $Id$
  """
! # Copyright (c) 2005 by eduplone Open Source Business Network EEIG, contributed
  # by FH-Aargau, Switzerland
  #
! # Generated: Mon Jan 10 11:01:26 2005
  # Generator: ArchGenXML Version 1.2 devel 3 http://sf.net/projects/archetypes/
  #

Index: BlindGapAnswer.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/answers/BlindGapAnswer.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** BlindGapAnswer.py	18 Dec 2004 14:04:22 -0000	1.20
--- BlindGapAnswer.py	10 Jan 2005 12:49:18 -0000	1.21
***************
*** 5,12 ****
  RCS-ID $Id$
  """
! # Copyright (c) 2004 by eduplone Open Source Business Network EEIG, contributed
  # by FH-Aargau, Switzerland
  #
! # Generated: Sat Dec 18 14:43:46 2004
  # Generator: ArchGenXML Version 1.2 devel 3 http://sf.net/projects/archetypes/
  #
--- 5,12 ----
  RCS-ID $Id$
  """
! # Copyright (c) 2005 by eduplone Open Source Business Network EEIG, contributed
  # by FH-Aargau, Switzerland
  #
! # Generated: Mon Jan 10 11:01:27 2005
  # Generator: ArchGenXML Version 1.2 devel 3 http://sf.net/projects/archetypes/
  #



-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt