EduploneTest/types EduploneFillGap.py,1.1.1.1,1.2 EduploneFillGapAnswer.py,1.1.1.1,1.2 EduploneFreeText.py,1.2,1.3 EduploneFreeTextAnswer.py,1.1.1.1,1.2 EduploneMatching.py,1.1.1.1,1.2 EduploneMatchingAnswer.py,1.1.1.1,1.2 EduploneMultiChoice.py,1.1.1.1,1.2 EduploneMultiChoiceAnswer.py,1.2,1.3 EduploneSingleChoice.py,1.1.1.1,1.2 EduploneSingleChoiceAnswer.py,1.1.1.1,1.2 EduploneTestMember.py,1.1.1.1,1.2 EduploneTestMemberFolder.py,1.1.1.1,1.2 EduploneTestingEnvironment.py,1.1.1.1,1.2 EduploneTextTask.py,1.1.1.1,1.2 EduploneTextTaskAnswer.py,1.1.1.1,1.2 EduploneTrueFalse.py,1.1.1.1,1.2 EduploneTrueFalseAnswer.py,1.1.1.1,1.2
Jens Klein <[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-serv7362/types
Modified Files:
EduploneFillGap.py EduploneFillGapAnswer.py
EduploneFreeText.py EduploneFreeTextAnswer.py
EduploneMatching.py EduploneMatchingAnswer.py
EduploneMultiChoice.py EduploneMultiChoiceAnswer.py
EduploneSingleChoice.py EduploneSingleChoiceAnswer.py
EduploneTestMember.py EduploneTestMemberFolder.py
EduploneTestingEnvironment.py EduploneTextTask.py
EduploneTextTaskAnswer.py EduploneTrueFalse.py
EduploneTrueFalseAnswer.py
Log Message:
first big cleanup. removed several unused dependencies and did a first
cleanup, well lots of work to do still.
Index: EduploneSingleChoice.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/types/EduploneSingleChoice.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** EduploneSingleChoice.py 28 Sep 2004 21:08:55 -0000 1.1.1.1
--- EduploneSingleChoice.py 29 Sep 2004 11:25:04 -0000 1.2
***************
*** 21,33 ****
from Products.CMFCore import CMFCorePermissions
- from Products.EduploneTypes.IMSBaseXML import IMSBaseXML
-
- from Products.ATContentTypes.types.ATFolder import ATFolder as PARENT
-
-
-
from Products.EduploneTest.EduploneTaskSchema import *
from Products.Archetypes.Marshall import PrimaryFieldMarshaller
schema = Schema((
--- 21,28 ----
from Products.CMFCore import CMFCorePermissions
from Products.EduploneTest.EduploneTaskSchema import *
from Products.Archetypes.Marshall import PrimaryFieldMarshaller
+ PARENT = OrderedBaseFolder
schema = Schema((
***************
*** 41,53 ****
)
! actions = PARENT.actions + ( \
! {
! 'id': 'imscp_export',
! 'name': 'IMS-Export',
! 'action': 'string:${object_url}/zip_export',
! 'permissions': (CMFCorePermissions.ManagePortal,),
! 'category': 'object',
! },
!
{'id': 'view',
'name': 'View',
--- 36,40 ----
)
! actions = ( \
{'id': 'view',
'name': 'View',
***************
*** 57,61 ****
)
! class EduploneSingleChoice(PARENT,IMSBaseXML):
""" A folderish Task-Object for eduplone """
__implements__ = PARENT.__implements__
--- 44,48 ----
)
! class EduploneSingleChoice(PARENT):
""" A folderish Task-Object for eduplone """
__implements__ = PARENT.__implements__
***************
*** 69,72 ****
allowed_content_types = ('eduplone SingleChoiceAnswer',)
content_icon = 'questionmark.gif'
!
registerType(EduploneSingleChoice)
--- 56,61 ----
allowed_content_types = ('eduplone SingleChoiceAnswer',)
content_icon = 'questionmark.gif'
! filter_content_types = 1
! global_allow = 0
!
registerType(EduploneSingleChoice)
Index: EduploneTrueFalse.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/types/EduploneTrueFalse.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** EduploneTrueFalse.py 28 Sep 2004 21:08:57 -0000 1.1.1.1
--- EduploneTrueFalse.py 29 Sep 2004 11:25:04 -0000 1.2
***************
*** 21,32 ****
from Products.CMFCore import CMFCorePermissions
- from Products.EduploneTypes.IMSBaseXML import IMSBaseXML
-
- from Products.ATContentTypes.types.ATFolder import ATFolder as PARENT
-
-
from Products.EduploneTest.EduploneTaskSchema import *
from Products.Archetypes.Marshall import PrimaryFieldMarshaller
schema = Schema((
--- 21,28 ----
from Products.CMFCore import CMFCorePermissions
from Products.EduploneTest.EduploneTaskSchema import *
from Products.Archetypes.Marshall import PrimaryFieldMarshaller
+ PARENT = OrderedBaseFolder
schema = Schema((
***************
*** 41,52 ****
! actions = PARENT.actions + ( \
! {
! 'id': 'imscp_export',
! 'name': 'IMS-Export',
! 'action': 'string:${object_url}/zip_export',
! 'permissions': (CMFCorePermissions.ManagePortal,),
! 'category': 'object',
! },
{'id': 'view',
--- 37,42 ----
! actions =( \
!
{'id': 'view',
***************
*** 57,61 ****
)
! class EduploneTrueFalse(PARENT,IMSBaseXML):
""" A folderish Task-Object for eduplone """
__implements__ = PARENT.__implements__
--- 47,51 ----
)
! class EduploneTrueFalse(PARENT):
""" A folderish Task-Object for eduplone """
__implements__ = PARENT.__implements__
***************
*** 69,72 ****
--- 59,65 ----
allowed_content_types = ('eduplone TrueFalseAnswer',)
content_icon = 'questionmark.gif'
+ filter_content_types = 1
+ global_allow = 0
+
registerType(EduploneTrueFalse)
Index: EduploneFreeText.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/types/EduploneFreeText.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EduploneFreeText.py 28 Sep 2004 22:02:37 -0000 1.2
--- EduploneFreeText.py 29 Sep 2004 11:25:04 -0000 1.3
***************
*** 21,31 ****
from Products.CMFCore import CMFCorePermissions
- from Products.EduploneTypes.IMSBaseXML import IMSBaseXML
-
- from Products.ATContentTypes.types.ATFolder import ATFolder as PARENT
-
from Products.EduploneTest.EduploneTaskSchema import *
from Products.Archetypes.Marshall import PrimaryFieldMarshaller
schema = Schema((
--- 21,28 ----
from Products.CMFCore import CMFCorePermissions
from Products.EduploneTest.EduploneTaskSchema import *
from Products.Archetypes.Marshall import PrimaryFieldMarshaller
+ PARENT = OrderedBaseFolder
schema = Schema((
***************
*** 40,52 ****
! actions = PARENT.actions + ( \
! {
! 'id': 'imscp_export',
! 'name': 'IMS-Export',
! 'action': 'string:${object_url}/zip_export',
! 'permissions': (CMFCorePermissions.ManagePortal,),
! 'category': 'object',
! },
!
{'id': 'view',
'name': 'View',
--- 37,41 ----
! actions = ( \
{'id': 'view',
'name': 'View',
***************
*** 56,60 ****
)
! class EduploneFreeText(PARENT,IMSBaseXML):
""" A folderish Task-Object for eduplone """
__implements__ = PARENT.__implements__
--- 45,49 ----
)
! class EduploneFreeText(PARENT):
""" A folderish Task-Object for eduplone """
__implements__ = PARENT.__implements__
***************
*** 68,72 ****
allowed_content_types = ('eduplone FreeTextAnswer',)
content_icon = 'questionmark.gif'
!
--- 57,62 ----
allowed_content_types = ('eduplone FreeTextAnswer',)
content_icon = 'questionmark.gif'
! global_allow = 0
! filter_content_types = 0
Index: EduploneFillGap.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/types/EduploneFillGap.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** EduploneFillGap.py 28 Sep 2004 21:08:54 -0000 1.1.1.1
--- EduploneFillGap.py 29 Sep 2004 11:25:04 -0000 1.2
***************
*** 21,28 ****
from Products.CMFCore import CMFCorePermissions
- from Products.EduploneTypes.IMSBaseXML import IMSBaseXML
-
- from Products.ATContentTypes.types.ATFolder import ATFolder as PARENT
-
from Products.EduploneTest.EduploneTaskSchema import *
from Products.Archetypes.Marshall import PrimaryFieldMarshaller
--- 21,24 ----
***************
*** 30,33 ****
--- 26,30 ----
import re
+ PARENT = OrderedBaseFolder
schema = Schema((
***************
*** 54,64 ****
actions = ( \
- # {
- # 'id': 'imscp_export',
- # 'name': 'IMS-Export',
- # 'action': 'string:${object_url}/zip_export',
- # 'permissions': (CMFCorePermissions.ManagePortal,),
- # 'category': 'object',
- # },
{'id': 'view',
--- 51,54 ----
***************
*** 80,107 ****
'permissions' : (CMFCorePermissions.ModifyPortalContent,),
},
- # {
- # 'id' : 'atct_edit',
- # 'name' : 'ATCT_Edit',
- # 'action' : 'string:${object_url}/atct_edit',
- # 'permissions' : (CMFCorePermissions.ModifyPortalContent,),
- # },
)
! class EduploneFillGap(PARENT,IMSBaseXML):
""" A folderish Task-Object for eduplone """
- __implements__ = PARENT.__implements__
schema = PARENT.schema + schema
portal_type = meta_type = "eduplone " +'FillGap' #+PARENT.meta_type
- ##archetype_name = PARENT.archetype_name[2:]+" (ep task)"
archetype_name ="FillGap (ep task)"
- actions=actions
- allowed_content_types = ('eduplone FillGapAnswer',)
content_icon = 'questionmark.gif'
!
! #def edit(self, *args, **kwargs):
! # """ """
! # return str(*args, **kwargs)
def getRenderedText(self, render_as="user"):
--- 70,88 ----
'permissions' : (CMFCorePermissions.ModifyPortalContent,),
},
)
! class EduploneFillGap(PARENT):
""" A folderish Task-Object for eduplone """
schema = PARENT.schema + schema
portal_type = meta_type = "eduplone " +'FillGap' #+PARENT.meta_type
archetype_name ="FillGap (ep task)"
content_icon = 'questionmark.gif'
!
! actions=actions
! allowed_content_types = ('eduplone FillGapAnswer',)
! filter_content_types = 1
! global_allow = 0
def getRenderedText(self, render_as="user"):
Index: EduploneTestMember.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/types/EduploneTestMember.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** EduploneTestMember.py 28 Sep 2004 21:08:55 -0000 1.1.1.1
--- EduploneTestMember.py 29 Sep 2004 11:25:04 -0000 1.2
***************
*** 17,30 ****
else:
from Products.Archetypes.public import *
!
! from Products.ATContentTypes.types.ATFolder import ATFolder
!
from Products.Archetypes.Marshall import PrimaryFieldMarshaller
from Products.CMFCore import CMFCorePermissions
- from Products.EduploneTypes.IMSBaseXML import IMSBaseXML
- from Products.EduploneTypes.interfaces.webdidactic import IKnowledgeUnit
- from Products.EduploneTypes.WebdidacticSchema import *
-
actions = (
{'id': 'view',
--- 17,24 ----
else:
from Products.Archetypes.public import *
!
from Products.Archetypes.Marshall import PrimaryFieldMarshaller
from Products.CMFCore import CMFCorePermissions
actions = (
{'id': 'view',
***************
*** 56,79 ****
! class EduploneTestMember(ATFolder, BaseContent, IMSBaseXML):
""" An answer for eduplone """
- __implements__ = BaseContent.__implements__ + (IKnowledgeUnit,)
schema = BaseContent.schema + schema
portal_type = meta_type = "eduplone TestMember"
- actions = actions
archetype_name = "Member (ep Test)"
def initializeArchetype(self, **kwargs):
! BaseFolder.initializeArchetype(self, **kwargs)
self._scoreOverride = {}
- factory_type_information = {
- #'content_icon':'canvasqti_icon.gif',
- 'global_allow': 0,
- 'filter_content_types': 1,
- }
-
def _saveQuestionAnswers(self, user, questionid, answers={}):
""" """
--- 50,68 ----
! class EduploneTestMember(BaseContent):
""" An answer for eduplone """
schema = BaseContent.schema + schema
portal_type = meta_type = "eduplone TestMember"
archetype_name = "Member (ep Test)"
+ actions = actions
+ global_allow = 0
+
def initializeArchetype(self, **kwargs):
! BaseContent.initializeArchetype(self, **kwargs)
self._scoreOverride = {}
def _saveQuestionAnswers(self, user, questionid, answers={}):
""" """
***************
*** 127,140 ****
if self.aq_parent.aq_parent[questionId].meta_type in ['eduplone TextTask','eduplone FreeText', 'eduplone SingleChoice']:
try:
! return self.answers[questionId][questionId]
except:
! return ''
else:
! try:
! print self.answers[questionId][answerId]
! return self.answers[questionId][answerId]
! except:
! return ''
registerType(EduploneTestMember)
--- 116,130 ----
if self.aq_parent.aq_parent[questionId].meta_type in ['eduplone TextTask','eduplone FreeText', 'eduplone SingleChoice']:
+ # FIXME, bad style with try/except
try:
! return self.answers[questionId][questionId]
except:
! return ''
else:
! try:
! print self.answers[questionId][answerId]
! return self.answers[questionId][answerId]
! except:
! return ''
registerType(EduploneTestMember)
Index: EduploneSingleChoiceAnswer.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/types/EduploneSingleChoiceAnswer.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** EduploneSingleChoiceAnswer.py 28 Sep 2004 21:08:55 -0000 1.1.1.1
--- EduploneSingleChoiceAnswer.py 29 Sep 2004 11:25:04 -0000 1.2
***************
*** 21,27 ****
from Products.CMFCore import CMFCorePermissions
- from Products.EduploneTypes.IMSBaseXML import IMSBaseXML
- from Products.EduploneTypes.interfaces.webdidactic import IKnowledgeUnit
- from Products.EduploneTypes.WebdidacticSchema import *
from Products.EduploneTest.EduploneAnswerSchema import *
--- 21,24 ----
***************
*** 47,55 ****
! class EduploneSingleChoiceAnswer(BaseContent,IMSBaseXML):
""" An answer for eduplone """
- __implements__ = BaseContent.__implements__ + (IKnowledgeUnit,)
-
schema = BaseContent.schema + schema
portal_type = meta_type = "eduplone SingleChoiceAnswer"
--- 44,50 ----
! class EduploneSingleChoiceAnswer(BaseContent):
""" An answer for eduplone """
schema = BaseContent.schema + schema
portal_type = meta_type = "eduplone SingleChoiceAnswer"
Index: EduploneMatchingAnswer.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/types/EduploneMatchingAnswer.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** EduploneMatchingAnswer.py 28 Sep 2004 21:08:54 -0000 1.1.1.1
--- EduploneMatchingAnswer.py 29 Sep 2004 11:25:04 -0000 1.2
***************
*** 21,27 ****
from Products.CMFCore import CMFCorePermissions
- from Products.EduploneTypes.IMSBaseXML import IMSBaseXML
- from Products.EduploneTypes.interfaces.webdidactic import IKnowledgeUnit
- from Products.EduploneTypes.WebdidacticSchema import *
from Products.EduploneTest.EduploneAnswerSchema import *
--- 21,24 ----
***************
*** 47,55 ****
! class EduploneMatchingAnswer(BaseContent,IMSBaseXML):
""" An answer for eduplone """
- __implements__ = BaseContent.__implements__ + (IKnowledgeUnit,)
-
schema = BaseContent.schema + schema
portal_type = meta_type = "eduplone MatchingAnswer"
--- 44,50 ----
! class EduploneMatchingAnswer(BaseContent):
""" An answer for eduplone """
schema = BaseContent.schema + schema
portal_type = meta_type = "eduplone MatchingAnswer"
Index: EduploneFreeTextAnswer.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/types/EduploneFreeTextAnswer.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** EduploneFreeTextAnswer.py 28 Sep 2004 21:08:54 -0000 1.1.1.1
--- EduploneFreeTextAnswer.py 29 Sep 2004 11:25:04 -0000 1.2
***************
*** 21,27 ****
from Products.CMFCore import CMFCorePermissions
- from Products.EduploneTypes.IMSBaseXML import IMSBaseXML
- from Products.EduploneTypes.interfaces.webdidactic import IKnowledgeUnit
- from Products.EduploneTypes.WebdidacticSchema import *
from Products.EduploneTest.EduploneAnswerSchema import *
--- 21,24 ----
***************
*** 31,39 ****
! class EduploneFreeTextAnswer(BaseContent,IMSBaseXML):
""" An answer for eduplone """
- __implements__ = BaseContent.__implements__ + (IKnowledgeUnit,)
-
schema = BaseContent.schema + schema
portal_type = meta_type = "eduplone FreeTextAnswer"
--- 28,34 ----
! class EduploneFreeTextAnswer(BaseContent):
""" An answer for eduplone """
schema = BaseContent.schema + schema
portal_type = meta_type = "eduplone FreeTextAnswer"
Index: EduploneTestMemberFolder.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/types/EduploneTestMemberFolder.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** EduploneTestMemberFolder.py 28 Sep 2004 21:08:56 -0000 1.1.1.1
--- EduploneTestMemberFolder.py 29 Sep 2004 11:25:04 -0000 1.2
***************
*** 16,26 ****
else:
from Products.Archetypes.public import *
- from Products.Archetypes.utils import DisplayList
from Products.CMFCore import CMFCorePermissions
! from Products.EduploneTypes.IMSBaseXML import IMSBaseXML
! from Products.ATContentTypes.types.ATFolder import ATFolder as PARENT
! from Products.EduploneTest.EduploneTaskSchema import *
from Products.Archetypes.Marshall import PrimaryFieldMarshaller
schema = Schema((
StringField('foldername',
--- 16,27 ----
else:
from Products.Archetypes.public import *
from Products.CMFCore import CMFCorePermissions
! from Products.Archetypes.utils import DisplayList
from Products.Archetypes.Marshall import PrimaryFieldMarshaller
+ from Products.EduploneTest.EduploneTaskSchema import *
+
+ PARENT = OrderedBaseFolder
+
schema = Schema((
StringField('foldername',
***************
*** 33,37 ****
! actions = PARENT.actions + ( \
{
'id': 'view',
--- 34,38 ----
! actions = ( \
{
'id': 'view',
***************
*** 50,68 ****
! class EduploneTestMemberFolder(PARENT,IMSBaseXML):
""" A folderish Task-Object for eduplone """
!
! __implements__ = BaseContent.__implements__ # + (IKnowledgeUnit,)
schema = BaseContent.schema #+ schema
portal_type = meta_type = "eduplone TestMemberFolder"
archetype_name = "MemberFolder (ep Test)"
! allowed_content_types = ('eduplone TestMember')
actions = actions
- # factory_type_information = {
- # #'content_icon':'canvasqti_icon.gif',
- # 'global_allow': 0,
- # 'filter_content_types': 1,
- # }
def manageTestMembers(self, ploneUsers=[], verifiedTestMembers=[], waitingTestMembers=[], \
--- 51,68 ----
! class EduploneTestMemberFolder(PARENT):
""" A folderish Task-Object for eduplone """
!
schema = BaseContent.schema #+ schema
portal_type = meta_type = "eduplone TestMemberFolder"
archetype_name = "MemberFolder (ep Test)"
!
! # FTI
actions = actions
+ allowed_content_types = ('eduplone TestMember')
+ global_allow = 0
+ filter_content_types = 1
+
def manageTestMembers(self, ploneUsers=[], verifiedTestMembers=[], waitingTestMembers=[], \
Index: EduploneMatching.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/types/EduploneMatching.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** EduploneMatching.py 28 Sep 2004 21:08:54 -0000 1.1.1.1
--- EduploneMatching.py 29 Sep 2004 11:25:04 -0000 1.2
***************
*** 21,28 ****
from Products.CMFCore import CMFCorePermissions
- from Products.EduploneTypes.IMSBaseXML import IMSBaseXML
-
- from Products.ATContentTypes.types.ATFolder import ATFolder as PARENT
-
from AccessControl import getSecurityManager
--- 21,24 ----
***************
*** 30,33 ****
--- 26,30 ----
from Products.Archetypes.Marshall import PrimaryFieldMarshaller
+ PARENT = OrderedBaseFolder
schema = Schema((
***************
*** 41,52 ****
)
! actions = PARENT.actions + ( \
! # {
! # 'id': 'imscp_export',
! # 'name': 'IMS-Export',
! # 'action': 'string:${object_url}/zip_export',
! # 'permissions': (CMFCorePermissions.ManagePortal,),
! # 'category': 'object',
! # },
{'id': 'view',
--- 38,42 ----
)
! actions = ( \
{'id': 'view',
***************
*** 58,62 ****
! class EduploneMatching(PARENT,IMSBaseXML):
""" A folderish Task-Object for eduplone """
__implements__ = PARENT.__implements__
--- 48,52 ----
! class EduploneMatching(PARENT):
""" A folderish Task-Object for eduplone """
__implements__ = PARENT.__implements__
***************
*** 70,74 ****
allowed_content_types = ('eduplone MatchingAnswer',)
content_icon = 'questionmark.gif'
!
def matchingAnswers(self):
--- 60,65 ----
allowed_content_types = ('eduplone MatchingAnswer',)
content_icon = 'questionmark.gif'
! filter_content_types = 1
! global_allow = 0
def matchingAnswers(self):
Index: EduploneTextTaskAnswer.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/types/EduploneTextTaskAnswer.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** EduploneTextTaskAnswer.py 28 Sep 2004 21:08:57 -0000 1.1.1.1
--- EduploneTextTaskAnswer.py 29 Sep 2004 11:25:04 -0000 1.2
***************
*** 21,27 ****
from Products.CMFCore import CMFCorePermissions
- from Products.EduploneTypes.IMSBaseXML import IMSBaseXML
- from Products.EduploneTypes.interfaces.webdidactic import IKnowledgeUnit
- from Products.EduploneTypes.WebdidacticSchema import *
from Products.EduploneTest.EduploneAnswerSchema import *
--- 21,24 ----
***************
*** 30,37 ****
)
! class EduploneTextTaskAnswer(BaseContent,IMSBaseXML):
""" An answer for eduplone """
- __implements__ = BaseContent.__implements__ + (IKnowledgeUnit,)
schema = BaseContent.schema + schema
--- 27,33 ----
)
! class EduploneTextTaskAnswer(BaseContent,):
""" An answer for eduplone """
schema = BaseContent.schema + schema
Index: EduploneTestingEnvironment.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/types/EduploneTestingEnvironment.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** EduploneTestingEnvironment.py 28 Sep 2004 21:08:57 -0000 1.1.1.1
--- EduploneTestingEnvironment.py 29 Sep 2004 11:25:04 -0000 1.2
***************
*** 2,7 ****
#-----------------------------------------------------------------------------
# Name: EduploneTestingEnvironment.py
- # Purpose: ATContentTypes ATFolder with own pageable skins
- # and IMS Export
#
# Author: Nils Haagen <[email protected]> and others
--- 2,5 ----
***************
*** 26,35 ****
from Products.CMFCore.utils import getToolByName
! from Products.ATContentTypes.types.ATFolder import ATFolder
! from Products.EduploneTypes.IMSBaseXML import IMSBaseXML
! from Products.EduploneTypes.interfaces.webdidactic import IKnowledgeUnit
! import Products.EduploneTest.utils as utils
- from Products.EduploneTypes.WebdidacticSchema import *
from Products.EduploneTest.EduploneAnswerSchema import *
from Products.Archetypes.Marshall import PrimaryFieldMarshaller
--- 24,29 ----
from Products.CMFCore.utils import getToolByName
! from Products.EduploneTest import utils as utils
from Products.EduploneTest.EduploneAnswerSchema import *
from Products.Archetypes.Marshall import PrimaryFieldMarshaller
***************
*** 123,127 ****
! class EduploneTestingEnvironment(ATFolder, IMSBaseXML, BaseContent):
""" A simple folderish archetype for eduplone """
--- 117,121 ----
! class EduploneTestingEnvironment(OrderedBaseFolder):
""" A simple folderish archetype for eduplone """
***************
*** 139,143 ****
def initializeArchetype(self, **kwargs):
! BaseFolder.initializeArchetype(self, **kwargs)
self.invokeFactory(id="users", type_name="eduplone TestMemberFolder")
--- 133,137 ----
def initializeArchetype(self, **kwargs):
! OrderedBaseFolder.initializeArchetype(self, **kwargs)
self.invokeFactory(id="users", type_name="eduplone TestMemberFolder")
Index: EduploneFillGapAnswer.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/types/EduploneFillGapAnswer.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** EduploneFillGapAnswer.py 28 Sep 2004 21:08:54 -0000 1.1.1.1
--- EduploneFillGapAnswer.py 29 Sep 2004 11:25:04 -0000 1.2
***************
*** 21,30 ****
from Products.CMFCore import CMFCorePermissions
- from Products.EduploneTypes.IMSBaseXML import IMSBaseXML
- #
-
- from Products.ATContentTypes.types.ATDocument import ATDocument as PARENT
- from Products.EduploneTypes.interfaces.webdidactic import IKnowledgeUnit
- from Products.EduploneTypes.WebdidacticSchema import *
from Products.EduploneTest.EduploneAnswerSchema import *
--- 21,24 ----
***************
*** 47,55 ****
! class EduploneFillGapAnswer(BaseContent,IMSBaseXML):
""" An answer for eduplone """
- __implements__ = BaseContent.__implements__ + (IKnowledgeUnit,)
-
schema = BaseContent.schema + schema
portal_type = meta_type = "eduplone FillGapAnswer"
--- 41,47 ----
! class EduploneFillGapAnswer(BaseContent):
""" An answer for eduplone """
schema = BaseContent.schema + schema
portal_type = meta_type = "eduplone FillGapAnswer"
Index: EduploneMultiChoiceAnswer.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/types/EduploneMultiChoiceAnswer.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EduploneMultiChoiceAnswer.py 28 Sep 2004 22:02:37 -0000 1.2
--- EduploneMultiChoiceAnswer.py 29 Sep 2004 11:25:04 -0000 1.3
***************
*** 21,27 ****
from Products.CMFCore import CMFCorePermissions
- from Products.EduploneTypes.IMSBaseXML import IMSBaseXML
- from Products.EduploneTypes.interfaces.webdidactic import IKnowledgeUnit
- from Products.EduploneTypes.WebdidacticSchema import *
from Products.EduploneTest.EduploneAnswerSchema import *
--- 21,24 ----
***************
*** 45,52 ****
)
! class EduploneMultiChoiceAnswer(BaseContent,IMSBaseXML):
""" An answer for eduplone """
- __implements__ = BaseContent.__implements__ + (IKnowledgeUnit,)
schema = BaseContent.schema + schema
--- 42,48 ----
)
! class EduploneMultiChoiceAnswer(BaseContent):
""" An answer for eduplone """
schema = BaseContent.schema + schema
Index: EduploneMultiChoice.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/types/EduploneMultiChoice.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** EduploneMultiChoice.py 28 Sep 2004 21:08:54 -0000 1.1.1.1
--- EduploneMultiChoice.py 29 Sep 2004 11:25:04 -0000 1.2
***************
*** 21,32 ****
from Products.CMFCore import CMFCorePermissions
- from Products.EduploneTypes.IMSBaseXML import IMSBaseXML
-
- from Products.ATContentTypes.types.ATFolder import ATFolder as PARENT
-
-
from Products.EduploneTest.EduploneTaskSchema import *
from Products.Archetypes.Marshall import PrimaryFieldMarshaller #, RFC822Marshaller
schema = Schema((
QuestionField,
--- 21,29 ----
from Products.CMFCore import CMFCorePermissions
from Products.EduploneTest.EduploneTaskSchema import *
from Products.Archetypes.Marshall import PrimaryFieldMarshaller #, RFC822Marshaller
+ PARENT = OrderedBaseFolder
+
schema = Schema((
QuestionField,
***************
*** 42,53 ****
! actions = PARENT.actions + ( \
! # {
! # 'id': 'imscp_export',
! # 'name': 'IMS-Export',
! # 'action': 'string:${object_url}/zip_export',
! # 'permissions': (CMFCorePermissions.ManagePortal,),
! # 'category': 'object',
! # },
{'id': 'view',
--- 39,43 ----
! actions = ( \
{'id': 'view',
***************
*** 59,63 ****
)
! class EduploneMultiChoice(PARENT,IMSBaseXML):
""" A folderish Task-Object for eduplone """
__implements__ = PARENT.__implements__
--- 49,53 ----
)
! class EduploneMultiChoice(PARENT):
""" A folderish Task-Object for eduplone """
__implements__ = PARENT.__implements__
***************
*** 71,74 ****
--- 61,66 ----
allowed_content_types = ('eduplone MultiChoiceAnswer',)
content_icon = 'questionmark.gif'
+ global_allow = 0
+ filter_content_types = 1
registerType(EduploneMultiChoice)
Index: EduploneTrueFalseAnswer.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/types/EduploneTrueFalseAnswer.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** EduploneTrueFalseAnswer.py 28 Sep 2004 21:08:57 -0000 1.1.1.1
--- EduploneTrueFalseAnswer.py 29 Sep 2004 11:25:04 -0000 1.2
***************
*** 21,27 ****
from Products.CMFCore import CMFCorePermissions
- from Products.EduploneTypes.IMSBaseXML import IMSBaseXML
- from Products.EduploneTypes.interfaces.webdidactic import IKnowledgeUnit
- from Products.EduploneTypes.WebdidacticSchema import *
from Products.EduploneTest.EduploneAnswerSchema import *
--- 21,24 ----
***************
*** 45,52 ****
)
! class EduploneTrueFalseAnswer(BaseContent,IMSBaseXML):
""" An answer for eduplone """
- __implements__ = BaseContent.__implements__ + (IKnowledgeUnit,)
schema = BaseContent.schema + schema
--- 42,48 ----
)
! class EduploneTrueFalseAnswer(BaseContent):
""" An answer for eduplone """
schema = BaseContent.schema + schema
***************
*** 63,67 ****
def getAnswer(self):
#print 'testausgabe',getattr(self,self.Schema()['title'].accessor)()
! return getattr(self,self.Schema()['title'].accessor)(),\
getattr(self,self.Schema()['Answer for the question'].accessor)(),\
getattr(self,self.Schema()['Answer correct?'].accessor)(),\
--- 59,63 ----
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)(),\
Index: EduploneTextTask.py
===================================================================
RCS file: /cvsroot/eduplone/EduploneTest/types/EduploneTextTask.py,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** EduploneTextTask.py 28 Sep 2004 21:08:57 -0000 1.1.1.1
--- EduploneTextTask.py 29 Sep 2004 11:25:04 -0000 1.2
***************
*** 21,32 ****
from Products.CMFCore import CMFCorePermissions
- from Products.EduploneTypes.IMSBaseXML import IMSBaseXML
-
- from Products.ATContentTypes.types.ATFolder import ATFolder as PARENT
-
-
from Products.EduploneTest.EduploneTaskSchema import *
from Products.Archetypes.Marshall import PrimaryFieldMarshaller
schema = Schema((
--- 21,28 ----
from Products.CMFCore import CMFCorePermissions
from Products.EduploneTest.EduploneTaskSchema import *
from Products.Archetypes.Marshall import PrimaryFieldMarshaller
+ PARENT = OrderedBaseFolder
schema = Schema((
***************
*** 41,53 ****
! actions = PARENT.actions + ( \
! # {
! # 'id': 'imscp_export',
! # 'name': 'IMS-Export',
! # 'action': 'string:${object_url}/zip_export',
! # 'permissions': (CMFCorePermissions.ManagePortal,),
! # 'category': 'object',
! # },
!
{'id': 'view',
'name': 'View',
--- 37,42 ----
! actions = ( \
!
{'id': 'view',
'name': 'View',
***************
*** 57,61 ****
)
! class EduploneTextTask(PARENT,IMSBaseXML):
""" A folderish Task-Object for eduplone """
__implements__ = PARENT.__implements__
--- 46,50 ----
)
! class EduploneTextTask(PARENT):
""" A folderish Task-Object for eduplone """
__implements__ = PARENT.__implements__
***************
*** 69,75 ****
allowed_content_types = ('eduplone TextTaskAnswer',)
content_icon = 'questionmark.gif'
!
! __call__():
! """ """
registerType(EduploneTextTask)
--- 58,67 ----
allowed_content_types = ('eduplone TextTaskAnswer',)
content_icon = 'questionmark.gif'
! filter_content_types = 1
! global_allow = 0
!
! ## wth??
! ##__call__():
! ##""" """
registerType(EduploneTextTask)
-------------------------------------------------------
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