Changeset 7778 for main/waeup.sirp/branches

Timestamp:

7 Mar 2012, 17:57:12 (13 years ago)

Author:

uli

Message:

Move ResultEntry? to more general location for use by several submodules.

Location:

main/waeup.sirp/branches/ulif-schoolgrades/src/waeup/sirp

Files:

• applicants/applicant.py (modified) (2 diffs)
• widgets/objectwidget.py (modified) (1 diff)

main/waeup.sirp/branches/ulif-schoolgrades/src/waeup/sirp/applicants/applicant.py

@@ -23 +23 @@
 from zope.component.interfaces import IFactory
 from zope.event import notify
-from zope.schema.fieldproperty import FieldProperty
 from zope.securitypolicy.interfaces import IPrincipalRoleManager
 from zope.interface import implementedBy
@@ -32 +31 @@
 from waeup.sirp.interfaces import (
     IObjectHistory, IFileStoreHandler, IFileStoreNameChooser, ISIRPUtils,
-    IExtFileStore, IPDF, IUserAccount, IResultEntry)
+    IExtFileStore, IPDF, IUserAccount)
 from waeup.sirp.students.vocabularies import RegNumNotInSource
 from waeup.sirp.utils.helpers import attrs_to_fields
 from waeup.sirp.applicants.interfaces import IApplicant, IApplicantEdit
 from waeup.sirp.applicants.workflow import application_states_dict
-
-class ResultEntry(grok.Model):
-    grok.implements(IResultEntry)
-    subject = FieldProperty(IResultEntry['subject'])
-    grade = FieldProperty(IResultEntry['grade'])
 
 class Applicant(grok.Container):

main/waeup.sirp/branches/ulif-schoolgrades/src/waeup/sirp/widgets/objectwidget.py

@@ -78 +78 @@
 from zope.formlib.interfaces import IInputWidget
 from zope.publisher.interfaces.browser import IBrowserRequest
-from waeup.sirp.applicants.applicant import ResultEntry
+from waeup.sirp.schoolgrades import ResultEntry
 from waeup.sirp.schema.interfaces import IMultiValObject