Changeset 7436

Timestamp:

22 Dec 2011, 08:27:28 (13 years ago)

Author:

Henrik Bettermann

Message:

Set current_level when creating students from applicant data. Use new entry_level attribute from ApplicantsContainer?.

Location:

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

Files:

• applicant.py (modified) (1 diff)
• interfaces.py (modified) (2 diffs)
• tests/test_browser.py (modified) (1 diff)

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

@@ -114 +114 @@
         student['studycourse'].entry_session = self.__parent__.year
         student['studycourse'].current_session = self.__parent__.year
+        student['studycourse'].current_level = self.__parent__.entry_level
         self._copyPassportImage(student)
         # Update the catalog

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

@@ -31 +31 @@
 from waeup.sirp.interfaces import (
     ISIRPObject, year_range, validate_email, academic_sessions_vocab)
-from waeup.sirp.university.vocabularies import application_categories
+from waeup.sirp.university.vocabularies import (
+    application_categories, course_levels)
 from waeup.sirp.students.vocabularies import (
-  lgas_vocab, CertificateSource, GenderSource,
-  )
+    lgas_vocab, CertificateSource, GenderSource)
 from waeup.sirp.applicants.vocabularies import (
-  application_types_vocab, application_pins_vocab,
-  AppCatCertificateSource,
-  )
+    application_types_vocab, application_pins_vocab,
+    AppCatCertificateSource)
 from waeup.sirp.payments.interfaces import IOnlinePayment
 
@@ -156 +155 @@
         )
 
+    entry_level = schema.Choice(
+        title = u'Entry Level',
+        vocabulary = course_levels,
+        default = 100,
+        required = True,
+        )
+
     year = schema.Choice(
         title = u'Year of entrance',

main/waeup.sirp/trunk/src/waeup/sirp/applicants/tests/test_browser.py

@@ -93 +93 @@
         certificate.code = 'CERT1'
         certificate.application_category = 'basic'
+        certificate.start_level = 100
+        certificate.end_level = 500
         self.certificate = certificate
         self.app['faculties']['fac1'] = Faculty()