EduploneExam/questions BaseExamQuestion.py,1.30.2.3,1.30.2.4 FreeTextQuestion.py,1.26.2.2,1.26.2.3 MatchingQuestion.py,1.26.2.3,1.26.2.4 MathQuestion.py,1.25.2.2,1.25.2.3 MultipleChoiceQuestion.py,1.26.2.2,1.26.2.3 SingleChoiceQuestion.py,1.26.2.2,1.26.2.3 TextTaskQuestion.py,1.25.2.3,1.25.2.4 TrueFalseQuestion.py,1.26.2.3,1.26.2.4
Nils Haagen <[email protected]> Wed, 26 Oct 2005 13:57:10 +0000
| Newsgroups | gmane.comp.web.zope.eduplone.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/eduplone/EduploneExam/questions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24696
Modified Files:
Tag: exam-1_1
BaseExamQuestion.py FreeTextQuestion.py MatchingQuestion.py
MathQuestion.py MultipleChoiceQuestion.py
SingleChoiceQuestion.py TextTaskQuestion.py
TrueFalseQuestion.py
Log Message:
global allow=0
Index: FreeTextQuestion.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/questions/FreeTextQuestion.py,v
retrieving revision 1.26.2.2
retrieving revision 1.26.2.3
diff -C2 -d -r1.26.2.2 -r1.26.2.3
*** FreeTextQuestion.py 3 Oct 2005 15:34:17 -0000 1.26.2.2
--- FreeTextQuestion.py 26 Oct 2005 13:57:08 -0000 1.26.2.3
***************
*** 72,76 ****
allowed_content_types = ['FreeTextAnswer'] + list(getattr(BaseExamQuestion, 'allowed_content_types', []))
filter_content_types = 1
! global_allow = 1
allow_discussion = 0
content_icon = 'ExamQuestion.gif'
--- 72,76 ----
allowed_content_types = ['FreeTextAnswer'] + list(getattr(BaseExamQuestion, 'allowed_content_types', []))
filter_content_types = 1
! global_allow = 0
allow_discussion = 0
content_icon = 'ExamQuestion.gif'
Index: TrueFalseQuestion.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/questions/TrueFalseQuestion.py,v
retrieving revision 1.26.2.3
retrieving revision 1.26.2.4
diff -C2 -d -r1.26.2.3 -r1.26.2.4
*** TrueFalseQuestion.py 19 Oct 2005 20:47:02 -0000 1.26.2.3
--- TrueFalseQuestion.py 26 Oct 2005 13:57:08 -0000 1.26.2.4
***************
*** 37,40 ****
--- 37,49 ----
schema=Schema((
+ BooleanField('strict',
+ widget=BooleanWidget(
+ label='Strict',
+ label_msgid='EduploneExam_label_strict',
+ description_msgid='EduploneExam_help_strict',
+ i18n_domain='EduploneExam',
+ )
+ ),
+
),
)
***************
*** 63,67 ****
allowed_content_types = ['TrueFalseAnswer'] + list(getattr(BaseExamQuestion, 'allowed_content_types', []))
filter_content_types = 1
! global_allow = 1
allow_discussion = 0
content_icon = 'ExamQuestion.gif'
--- 72,76 ----
allowed_content_types = ['TrueFalseAnswer'] + list(getattr(BaseExamQuestion, 'allowed_content_types', []))
filter_content_types = 1
! global_allow = 0
allow_discussion = 0
content_icon = 'ExamQuestion.gif'
Index: TextTaskQuestion.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/questions/TextTaskQuestion.py,v
retrieving revision 1.25.2.3
retrieving revision 1.25.2.4
diff -C2 -d -r1.25.2.3 -r1.25.2.4
*** TextTaskQuestion.py 19 Oct 2005 20:47:02 -0000 1.25.2.3
--- TextTaskQuestion.py 26 Oct 2005 13:57:08 -0000 1.25.2.4
***************
*** 63,67 ****
allowed_content_types = ['TextTaskAnswer'] + list(getattr(BaseExamQuestion, 'allowed_content_types', []))
filter_content_types = 1
! global_allow = 1
allow_discussion = 0
content_icon = 'ExamQuestion.gif'
--- 63,67 ----
allowed_content_types = ['TextTaskAnswer'] + list(getattr(BaseExamQuestion, 'allowed_content_types', []))
filter_content_types = 1
! global_allow = 0
allow_discussion = 0
content_icon = 'ExamQuestion.gif'
Index: MultipleChoiceQuestion.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/questions/MultipleChoiceQuestion.py,v
retrieving revision 1.26.2.2
retrieving revision 1.26.2.3
diff -C2 -d -r1.26.2.2 -r1.26.2.3
*** MultipleChoiceQuestion.py 3 Oct 2005 15:34:17 -0000 1.26.2.2
--- MultipleChoiceQuestion.py 26 Oct 2005 13:57:08 -0000 1.26.2.3
***************
*** 37,40 ****
--- 37,49 ----
schema=Schema((
+ BooleanField('strict',
+ widget=BooleanWidget(
+ label='Strict',
+ label_msgid='EduploneExam_label_strict',
+ description_msgid='EduploneExam_help_strict',
+ i18n_domain='EduploneExam',
+ )
+ ),
+
),
)
***************
*** 66,70 ****
allowed_content_types = ['MultipleChoiceAnswer'] + list(getattr(BaseExamQuestion, 'allowed_content_types', []))
filter_content_types = 1
! global_allow = 1
allow_discussion = 0
content_icon = 'ExamQuestion.gif'
--- 75,79 ----
allowed_content_types = ['MultipleChoiceAnswer'] + list(getattr(BaseExamQuestion, 'allowed_content_types', []))
filter_content_types = 1
! global_allow = 0
allow_discussion = 0
content_icon = 'ExamQuestion.gif'
Index: MathQuestion.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/questions/MathQuestion.py,v
retrieving revision 1.25.2.2
retrieving revision 1.25.2.3
diff -C2 -d -r1.25.2.2 -r1.25.2.3
*** MathQuestion.py 3 Oct 2005 15:34:17 -0000 1.25.2.2
--- MathQuestion.py 26 Oct 2005 13:57:08 -0000 1.25.2.3
***************
*** 63,67 ****
allowed_content_types = ['MathAnswer'] + list(getattr(BaseExamQuestion, 'allowed_content_types', []))
filter_content_types = 1
! global_allow = 1
allow_discussion = 0
content_icon = 'ExamQuestion.gif'
--- 63,67 ----
allowed_content_types = ['MathAnswer'] + list(getattr(BaseExamQuestion, 'allowed_content_types', []))
filter_content_types = 1
! global_allow = 0
allow_discussion = 0
content_icon = 'ExamQuestion.gif'
Index: MatchingQuestion.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/questions/MatchingQuestion.py,v
retrieving revision 1.26.2.3
retrieving revision 1.26.2.4
diff -C2 -d -r1.26.2.3 -r1.26.2.4
*** MatchingQuestion.py 19 Oct 2005 20:47:02 -0000 1.26.2.3
--- MatchingQuestion.py 26 Oct 2005 13:57:08 -0000 1.26.2.4
***************
*** 37,40 ****
--- 37,49 ----
schema=Schema((
+ BooleanField('strict',
+ widget=BooleanWidget(
+ label='Strict',
+ label_msgid='EduploneExam_label_strict',
+ description_msgid='EduploneExam_help_strict',
+ i18n_domain='EduploneExam',
+ )
+ ),
+
),
)
***************
*** 63,67 ****
allowed_content_types = ['MatchingAnswer'] + list(getattr(BaseExamQuestion, 'allowed_content_types', []))
filter_content_types = 1
! global_allow = 1
allow_discussion = 0
content_icon = 'ExamQuestion.gif'
--- 72,76 ----
allowed_content_types = ['MatchingAnswer'] + list(getattr(BaseExamQuestion, 'allowed_content_types', []))
filter_content_types = 1
! global_allow = 0
allow_discussion = 0
content_icon = 'ExamQuestion.gif'
Index: SingleChoiceQuestion.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/questions/SingleChoiceQuestion.py,v
retrieving revision 1.26.2.2
retrieving revision 1.26.2.3
diff -C2 -d -r1.26.2.2 -r1.26.2.3
*** SingleChoiceQuestion.py 3 Oct 2005 15:34:17 -0000 1.26.2.2
--- SingleChoiceQuestion.py 26 Oct 2005 13:57:08 -0000 1.26.2.3
***************
*** 63,67 ****
allowed_content_types = ['SingleChoiceAnswer'] + list(getattr(BaseExamQuestion, 'allowed_content_types', []))
filter_content_types = 1
! global_allow = 1
allow_discussion = 0
content_icon = 'ExamQuestion.gif'
--- 63,67 ----
allowed_content_types = ['SingleChoiceAnswer'] + list(getattr(BaseExamQuestion, 'allowed_content_types', []))
filter_content_types = 1
! global_allow = 0
allow_discussion = 0
content_icon = 'ExamQuestion.gif'
***************
*** 107,117 ****
#now calculate and set score
possibleCorrect=len(answerObjects) #is not the case for i.e. maching
! if self.getStrict():
! if possibleCorrect == correctCounter:
! score=self.getMaxScore()
! else:
! score=0
! else:
! score=float(self.getMaxScore()) / possibleCorrect * correctCounter
responseObj.setScore(score)
--- 107,111 ----
#now calculate and set score
possibleCorrect=len(answerObjects) #is not the case for i.e. maching
! score=float(self.getMaxScore()) / possibleCorrect * correctCounter
responseObj.setScore(score)
Index: BaseExamQuestion.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneExam/questions/BaseExamQuestion.py,v
retrieving revision 1.30.2.3
retrieving revision 1.30.2.4
diff -C2 -d -r1.30.2.3 -r1.30.2.4
*** BaseExamQuestion.py 19 Oct 2005 20:47:02 -0000 1.30.2.3
--- BaseExamQuestion.py 26 Oct 2005 13:57:08 -0000 1.30.2.4
***************
*** 68,81 ****
),
- BooleanField('strict',
- widget=BooleanWidget(
- label='Strict',
- label_msgid='EduploneExam_label_strict',
- description_msgid='EduploneExam_help_strict',
- i18n_domain='EduploneExam',
- )
- ),
-
ImageField('picture',
widget=ImageWidget(
label='Picture',
--- 68,73 ----
),
ImageField('picture',
+ schemata="pictures",
widget=ImageWidget(
label='Picture',
***************
*** 88,91 ****
--- 80,84 ----
ImageField('exemplar_picture',
+ schemata="pictures",
widget=ImageWidget(
label='Exemplar_picture',
-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information