Changeset 6087 for main/waeup.sirp/trunk/src/waeup/sirp/applicants/interfaces.py

Timestamp:

14 May 2011, 14:19:59 (14 years ago)

Author:

Henrik Bettermann

Message:

Adding some attributes to ApplicantsContainer?. Generate title and code of containers automatically.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/applicants/interfaces.py (modified) (6 diffs)

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

@@ -5 +5 @@
 ## $Id$
 ##
-## Copyright (C) 2011 Uli Fouquet
+## Copyright (C) 2011 Uli Fouquet & Henrik Bettermann
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -34 +34 @@
 from waeup.sirp.image.image import WAeUPImageFile
 from waeup.sirp.interfaces import IWAeUPObject, SimpleWAeUPVocabulary
+from waeup.sirp.university.vocabularies import FutureYearsSource
 
 
@@ -49 +50 @@
     )
 
-#: Categories of applications we support.
-#: Yet not complete nor correct.
-APPLICATION_CATEGORIES = (
-    ('Direct Entry Screening Exam (PDE)', 'pde'),
-    ('Post-UME', 'pume'),
-    ('Post-UDE', 'pude'),
-    ('PCE', 'pce'),
+#: Types of applications we support.
+APPLICATION_TYPES = (
+    ('Pre-NCE Programme', 'prence'),
+    ('Post UME Screening Test', 'pume'),
+    ('Post UDE Screening', 'pude'),
+    ('Part Time Degree in Education', 'sandwich'),
+    ('Part-Time Degree Programmes', 'pt'),
+    ('Diploma Programmes', 'dp'),
+    ('PCE Screening', 'pce'),
+    ('Certificate Programmes', 'ct'),
     ('Common Entry Screening Test (CEST)', 'cest'),
     )
 
 #: A :class:`waeup.sirp.interfaces.SimpleWAeUPVocabulary` of supported
-#: application categories.
-application_categories_vocab = SimpleWAeUPVocabulary(*APPLICATION_CATEGORIES)
+#: application or screening types.
+application_types_vocab = SimpleWAeUPVocabulary(*APPLICATION_TYPES)
 
 class GenderSource(BasicSourceFactory):
@@ -152 +156 @@
     code = schema.TextLine(
         title = u'Code',
-        description = u'Abbreviated code of applicants container',
-        default = u'NA',
-        required = True,
-        readonly = True,
-        )
+        default = u'-',
+        required = True,
+        readonly = True,
+        )
+        
+    title = schema.TextLine(
+        title = u'Title',
+        required = True,
+        default = u'-',
+        readonly = True,
+        )        
+        
+    prefix = schema.Choice(
+        title = u'Application target',
+        required = True,
+        default = None,
+        source = application_types_vocab,
+        readonly = True,
+        )
+
+    year = schema.Choice(
+        title = u'Year of entrance',
+        required = True,
+        default = None,
+        source = FutureYearsSource(),
+        readonly = True,
+        )                
 
     provider = schema.Choice(
@@ -163 +189 @@
         default = None,
         source = ApplicantContainerProviderSource(),
-        )
-
-    title = schema.TextLine(
-        title = u'Title of the type of applicants stored here',
-        required = True,
-        default = u'Untitled',
+        readonly = True,
         )
 
@@ -228 +249 @@
     """An applicants container contains university applicants.
     """
-    code = schema.TextLine(
-        title = u'Code',
-        description = u'Abbreviated code of applicants container',
-        default = u'NA',
-        required = True,
+    prefix = schema.Choice(
+        title = u'Application target',
+        required = True,
+        default = None,
+        source = application_types_vocab,
         readonly = False,
         )
 
-IApplicantsContainerAdd['code'].order =  IApplicantsContainer['code'].order
+    year = schema.Choice(
+        title = u'Year of entrance',
+        required = True,
+        default = None,
+        source = FutureYearsSource(),
+        readonly = False,
+        )                
+
+    provider = schema.Choice(
+        title = u'Applicants container type',
+        required = True,
+        default = None,
+        source = ApplicantContainerProviderSource(),
+        readonly = False,
+        )
+
+IApplicantsContainerAdd['prefix'].order =  IApplicantsContainer['prefix'].order
+IApplicantsContainerAdd['year'].order =  IApplicantsContainer['year'].order
+IApplicantsContainerAdd['provider'].order =  IApplicantsContainer['provider'].order
 
 class IApplicantBaseData(IWAeUPObject):