Changeset 6990

Timestamp:

3 Nov 2011, 15:31:49 (13 years ago)

Author:

Henrik Bettermann

Message:

Move registration_state definitions from students/workflow.py to interfaces.py.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• interfaces.py (modified) (4 diffs)
• students/workflow.py (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/interfaces.py

@@ -11 +11 @@
 from zope.schema.vocabulary import SimpleVocabulary, SimpleTerm
 
+CREATED = 'created'
+ADMITTED = 'admitted'
+CLEARANCE = 'clearance started'
+REQUESTED = 'clearance requested'
+CLEARED = 'cleared'
+PAID = 'school fee paid'
+RETURNING = 'returning'
+REGISTERED = 'courses registered'
+VALIDATED = 'courses validated'
+
 default_frontpage = u'' + open(os.path.join(
         os.path.dirname(__file__), 'frontpage.rst'), 'rb').read()
@@ -31 +41 @@
 
 academic_sessions_vocab = SimpleWAeUPVocabulary(*academic_sessions())
+
+registration_states_vocab = SimpleWAeUPVocabulary(
+    ('created', CREATED),
+    ('admitted', ADMITTED),
+    ('clearance started', CLEARANCE),
+    ('clearance requested', REQUESTED),
+    ('cleared', CLEARED),
+    ('school fee paid', PAID),
+    ('returning', RETURNING),
+    ('courses registered', REGISTERED),
+    ('courses validated', VALIDATED),
+    )
 
 class FatalCSVError(Exception):
@@ -208 +230 @@
 
     title = schema.TextLine(
-        title = u'Title of frontpage',
+        title = u'Title of Frontpage',
         default = u'Welcome to the Student Information and Registration ' +
                   u'Portal of Sample University',
@@ -225 +247 @@
         required = False,
         default = default_frontpage,
+        )
+
+    accommodation_session = schema.Choice(
+        title = u'Accommodation Booking Session',
+        source = academic_sessions_vocab,
+        default = datetime.now().year,
+        required = False,
+        readonly = False,
+        )
+
+    accommodation_states = schema.List(
+        title = u'Allowed States for Accommodation Booking',
+        value_type = schema.Choice(
+            vocabulary = registration_states_vocab,
+            ),
+        default = [],
         )
 

main/waeup.sirp/trunk/src/waeup/sirp/students/workflow.py

@@ -4 +4 @@
 from hurry.workflow.workflow import Transition, WorkflowState, NullCondition
 from hurry.workflow.interfaces import IWorkflowState, IWorkflowTransitionEvent
-from waeup.sirp.interfaces import IObjectHistory, IWAeUPWorkflowInfo
+from waeup.sirp.interfaces import (
+    IObjectHistory, IWAeUPWorkflowInfo,
+    CREATED, ADMITTED, CLEARANCE, REQUESTED, CLEARED, PAID, RETURNING,
+    REGISTERED, VALIDATED)
 from waeup.sirp.workflow import WAeUPWorkflow, WAeUPWorkflowInfo
 from waeup.sirp.utils.helpers import get_current_principal
 from waeup.sirp.students.interfaces import IStudent
 from waeup.sirp.students.utils import set_returning_data
-
-CREATED = 'created'
-ADMITTED = 'admitted'
-CLEARANCE = 'clearance started'
-REQUESTED = 'clearance requested'
-CLEARED = 'cleared'
-PAID = 'school fee paid'
-RETURNING = 'returning'
-REGISTERED = 'courses registered'
-VALIDATED = 'courses validated'
 
 REGISTRATION_TRANSITIONS = (