Changeset 8311

Timestamp:

29 Apr 2012, 19:47:24 (13 years ago)

Author:

Henrik Bettermann

Message:

Remove entry_level attribute. The entry level is given by the start level of the study course admitted.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/applicants

Files:

• applicant.py (modified) (5 diffs)
• export.py (modified) (1 diff)
• interfaces.py (modified) (1 diff)
• tests/test_batching.py (modified) (1 diff)
• tests/test_browser.py (modified) (4 diffs)
• tests/test_export.py (modified) (2 diffs)

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

@@ -32 +32 @@
     IObjectHistory, IFileStoreHandler, IFileStoreNameChooser, IKofaUtils,
     IExtFileStore, IPDF, IUserAccount)
+from waeup.kofa.interfaces import MessageFactory as _
 from waeup.kofa.students.vocabularies import RegNumNotInSource
 from waeup.kofa.utils.helpers import attrs_to_fields
@@ -80 +81 @@
 
     def createStudent(self, view=None):
-        """Create a student, fill with base data, create a StudentApplication
-        object and copy applicant data.
+        """Create a student, fill with base data, create an application slip
+        and copy applicant data.
         """
         # Is applicant in the correct state?
         if self.state != 'admitted':
-            return False, "Applicant has not yet been admitted."
+            return False, _('Applicant has not yet been admitted.')
         # Does registration number exist?
         student = createObject(u'waeup.Student')
@@ -91 +92 @@
             student.reg_number = self.reg_number
         except RegNumNotInSource:
-            return False, 'Registration Number exists.'
+            return False, _('Registration Number exists.')
         # Has the course_admitted field been properly filled?
         if self.course_admitted is None:
-            return False, 'No course admitted provided.'
+            return False, _('No course admitted provided.')
         # Add student object
         student.firstname = self.firstname
@@ -114 +115 @@
         student['studycourse'].entry_session = self.__parent__.year
         student['studycourse'].current_session = self.__parent__.year
-        student['studycourse'].current_level = self.__parent__.entry_level
+        student['studycourse'].current_level = self.course_admitted.start_level
         self._copyPassportImage(student)
         # Update the catalog
@@ -122 +123 @@
         self._createApplicationPDF(student, view=view)
 
-        return True, 'Student %s created' % student.student_id
+        return True, _('Student %s created') % student.student_id
 
     def _createApplicationPDF(self, student, view=None):

main/waeup.kofa/trunk/src/waeup/kofa/applicants/export.py

@@ -33 +33 @@
 
     #: Fieldnames considered by this exporter
-    fields = ('code', 'title', 'prefix', 'entry_level', 'year',
+    fields = ('code', 'title', 'prefix', 'year',
               'application_category', 'description',
               'startdate', 'enddate', 'strict_deadline')

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

@@ -188 +188 @@
         )
 
-    entry_level = schema.Choice(
-        title = _(u'Entry Level'),
-        vocabulary = course_levels,
-        required = True,
-        )
-
     # Maybe Uniben still needs this ...
     #ac_prefix = schema.Choice(

main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_batching.py

@@ -153 +153 @@
         self.assertEqual(container.title, u'General Studies 2012/2013')
         self.assertEqual(container.prefix, u'app')
-        self.assertEqual(container.entry_level, 100)
         self.assertEqual(container.year, 2012)
         self.assertEqual(container.application_category, 'basic')

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

@@ -86 +86 @@
         applicantscontainer.prefix = 'app'
         applicantscontainer.year = 2009
-        applicantscontainer.entry_level = 100
         applicantscontainer.application_category = 'basic'
         applicantscontainer.mode = 'create'
@@ -251 +250 @@
         self.browser.getControl(name="form.prefix").value = ['app']
         self.browser.getControl(name="form.year").value = ['2010']
-        self.browser.getControl(name="form.entry_level").value = ['100']
         self.browser.getControl(name="form.mode").value = ['create']
         self.browser.getControl(
@@ -266 +264 @@
         self.browser.getControl(name="form.prefix").value = ['app']
         self.browser.getControl(name="form.year").value = ['2010']
-        self.browser.getControl(name="form.entry_level").value = ['100']
         self.browser.getControl(name="form.mode").value = ['create']
         self.browser.getControl(
@@ -281 +278 @@
         self.browser.getControl(name="form.prefix").value = ['app']
         self.browser.getControl(name="form.year").value = ['2010']
-        self.browser.getControl(name="form.entry_level").value = ['100']
         self.browser.getControl(name="form.mode").value = ['create']
         #self.browser.getControl(name="form.ac_prefix").value = ['APP']

main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_export.py

@@ -53 +53 @@
         container.prefix = list(ApplicationTypeSource()(container))[0]
         container.year = 2012
-        container.entry_level = 100
         container.application_category = list(AppCatSource()(container))[0]
         container.description = u'Some Description\nwith linebreak\n'
@@ -72 +71 @@
         self.assertEqual(
             result,
-            'code,title,prefix,entry_level,year,application_category,'
+            'code,title,prefix,year,application_category,'
             'description,startdate,enddate,strict_deadline\r\n'
 
-            'dp2012,General Studies 2012/13,app,100,2012,basic,'
+            'dp2012,General Studies 2012/13,app,2012,basic,'
             '"Some Description\nwith linebreak\n<<de>>man spriht deutsh",'
             '2012-01-01 12:00:00+00:00,2012-01-31 23:00:00+00:00,1\r\n'