Changeset 10133

Timestamp:

2 May 2013, 05:30:25 (12 years ago)

Author:

Henrik Bettermann

Message:

At KwaraPoly? application_category and study_mode are basically identical. We need categories for full-time and part-time.

prend has been renamed to rmd. The students_catalog must be reindexed!

Location:

main/waeup.kwarapoly/trunk/src/waeup/kwarapoly

Files:

• applicants/tests/test_browser.py (modified) (3 diffs)
• applicants/utils.py (modified) (1 diff)
• interswitch/tests.py (modified) (3 diffs)
• utils/utils.py (modified) (1 diff)

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

@@ -53 +53 @@
         setSite(app)
 
-        # Add nd applicants container
-        self.ndcontainer = ApplicantsContainer()
-        self.ndcontainer.mode = 'create'
-        self.ndcontainer.code = u'nd2011'
-        self.ndcontainer.prefix = u'nd'
-        self.ndcontainer.application_category = u'nd'
-        self.ndcontainer.year = 2011
-        self.ndcontainer.application_fee = 300.0
-        self.ndcontainer.title = u'This is the nd2011 container'
-        self.app['applicants']['nd2011'] = self.ndcontainer
+        # Add ndft applicants container
+        self.ndftcontainer = ApplicantsContainer()
+        self.ndftcontainer.mode = 'create'
+        self.ndftcontainer.code = u'ndft2011'
+        self.ndftcontainer.prefix = u'ndft'
+        self.ndftcontainer.application_category = u'ndft'
+        self.ndftcontainer.year = 2011
+        self.ndftcontainer.application_fee = 300.0
+        self.ndftcontainer.title = u'This is the ndft2011 container'
+        self.app['applicants']['ndft2011'] = self.ndftcontainer
 
         delta = datetime.timedelta(days=10)
-        self.ndcontainer.startdate = datetime.datetime.now(pytz.utc) - delta
-        self.ndcontainer.enddate = datetime.datetime.now(pytz.utc) + delta
+        self.ndftcontainer.startdate = datetime.datetime.now(pytz.utc) - delta
+        self.ndftcontainer.enddate = datetime.datetime.now(pytz.utc) + delta
 
         # Populate university
         self.certificate = createObject('waeup.Certificate')
         self.certificate.code = 'CERT1'
-        self.certificate.application_category = 'nd'
+        self.certificate.application_category = 'ndft'
         self.certificate.start_level = 100
         self.certificate.end_level = 500
@@ -81 +81 @@
 
         # Add (customized) applicants
-        ndapplicant = createObject(u'waeup.Applicant')
-        ndapplicant.firstname = u'Anna'
-        ndapplicant.lastname = u'Post'
-        self.app['applicants']['nd2011'].addApplicant(ndapplicant)
-        self.ndapplication_number = ndapplicant.application_number
-        self.ndapplicant = self.app['applicants']['nd2011'][
-            self.ndapplication_number]
-        self.ndapplicant_path = ('http://localhost/app/applicants/nd2011/%s'
-            % self.ndapplication_number)
+        ndftapplicant = createObject(u'waeup.Applicant')
+        ndftapplicant.firstname = u'Anna'
+        ndftapplicant.lastname = u'Post'
+        self.app['applicants']['ndft2011'].addApplicant(ndftapplicant)
+        self.ndftapplication_number = ndftapplicant.application_number
+        self.ndftapplicant = self.app['applicants']['ndft2011'][
+            self.ndftapplication_number]
+        self.ndftapplicant_path = ('http://localhost/app/applicants/ndft2011/%s'
+            % self.ndftapplication_number)
 
         self.browser = Browser()
@@ -111 +111 @@
 
     def test_manage_and_view_applicant(self):
-        # Managers can manage nd applicants.
+        # Managers can manage ndft applicants.
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
-        self.browser.open(self.ndapplicant_path)
+        self.browser.open(self.ndftapplicant_path)
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertTrue("'O' Level" in self.browser.contents)
         self.assertFalse("Higher" in self.browser.contents)
-        self.browser.open(self.ndapplicant_path + '/manage')
+        self.browser.open(self.ndftapplicant_path + '/manage')
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertTrue("'O' Level" in self.browser.contents)
         self.assertTrue("Higher" in self.browser.contents)
-        self.browser.open(self.ndapplicant_path + '/edit')
+        self.browser.open(self.ndftapplicant_path + '/edit')
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertTrue("'O' Level" in self.browser.contents)
         self.assertFalse("Higher" in self.browser.contents)
-        self.browser.open(self.ndapplicant_path + '/application_slip.pdf')
+        self.browser.open(self.ndftapplicant_path + '/application_slip.pdf')
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
-        # Now we turn the nd applicant into an hnd applicant.
-        self.ndapplicant.applicant_id = u'hnd_anything'
-        self.browser.open(self.ndapplicant_path)
+        # Now we turn the ndft applicant into an hndft applicant.
+        self.ndftapplicant.applicant_id = u'hndft_anything'
+        self.browser.open(self.ndftapplicant_path)
         self.assertTrue("Higher" in self.browser.contents)
         self.assertTrue("'O' Level" in self.browser.contents)
-        self.browser.open(self.ndapplicant_path + '/edit')
+        self.browser.open(self.ndftapplicant_path + '/edit')
         self.assertTrue("Higher" in self.browser.contents)
         self.assertTrue("'O' Level" in self.browser.contents)

main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/applicants/utils.py

@@ -32 +32 @@
 
     APP_TYPES_DICT = {
-        'prend': ['Pre-ND Programme', 'RP'],
-        'hnd': ['HND Programmes', 'hnd'],
-        'nd': ['ND Programmes', 'nd'],
+        'rmd': ['Remedial Programme', 'RP'],
+        'hndft': ['HND Full-Time Programmes', 'HNDFT'],
+        'hndpt': ['HND Part-Time Programmes', 'HNDPT'],
+        'ndft': ['ND Full-Time Programmes', 'NDFT'],
+        'ndpt': ['ND Part-Time Programmes', 'NDPT'],
         'putme': ['Post-UTME Screening Exercise', 'PUTME'],
         'app': ['General Studies', 'APP'],

main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/interswitch/tests.py

@@ -300 +300 @@
         self.certificate2 = createObject('waeup.Certificate')
         self.certificate2.code = u'CERT2'
-        self.certificate2.application_category = 'nd'
+        self.certificate2.application_category = 'ndft'
         self.certificate2.study_mode = 'nd_ft'
         self.certificate2.start_level = 100
@@ -306 +306 @@
         self.app['faculties']['CPGS']['dep1'].certificates.addCertificate(
             self.certificate2)
-        self.applicantscontainer.application_category = 'nd'
+        self.applicantscontainer.application_category = 'ndft'
         self.applicant.applicant_id = u'nd_anything'
         
@@ -346 +346 @@
             in self.browser.contents)
 
-        # hnd fee goes to another account
+        # hndft fee goes to another account
         self.applicant.applicant_id = u'hnd_anything'
         self.browser.open(self.manage_path)

main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/utils/utils.py

@@ -29 +29 @@
     APP_CATS_DICT = {
         'basic': 'Basic',
-        'nd': 'National Diploma Programmes',
-        'hnd': 'Higher National Diploma Programmes',
+        'ndft': 'National Diploma Full-Time Programmes',
+        'ndpt': 'National Diploma Part-Time Programmes',
+        'hndft': 'Higher National Diploma Full-Time Programmes',
+        'hndpt': 'Higher National Diploma Part-Time Programmes',
         'pgd': 'Postgraduate Diploma Programmes',
-        'prend': 'Pre-ND Programmes',
+        'rmd': 'Remedial Programmes',
         }
 
     STUDY_MODES_DICT = {
-        'nd_ft': 'National Diploma Full Time',
-        'nd_pt': 'National Diploma Part Time',
-        'hnd_ft': 'Higher National Diploma Full Time',
-        'hnd_pt': 'Higher National Diploma Part Time',
-        'pgd_ft': 'Postgraduate Diploma Full Time',
-        'pgd_pt': 'Postgraduate Diploma Part Time',
-        'prend': 'Pre-ND',
+        'nd_ft': 'National Diploma Full-Time',
+        'nd_pt': 'National Diploma Part-Time',
+        'hnd_ft': 'Higher National Diploma Full-Time',
+        'hnd_pt': 'Higher National Diploma Part-Time',
+        'pgd_ft': 'Postgraduate Diploma Full-Time',
+        'pgd_pt': 'Postgraduate Diploma Part-Time',
+        'rmd': 'Remedial',
         }