Changeset 13999 for main/waeup.aaue/trunk

Timestamp:

29 Jun 2016, 04:51:19 (8 years ago)

Author:

Henrik Bettermann

Message:

Change letter text and split screening_date into date and time.

Location:

main/waeup.aaue/trunk/src/waeup/aaue/applicants

Files:

• browser.py (modified) (1 diff)
• tests/test_browser.py (modified) (1 diff)

main/waeup.aaue/trunk/src/waeup/aaue/applicants/browser.py

@@ -376 +376 @@
     def note(self):
         if self.context.screening_date:
+            year = self.context.__parent__.year
+            session = '%s/%s' % (year, year + 1)
+            sdate = self.context.screening_date
+            stime = ''
+            if '@' in self.context.screening_date:
+                sdate = self.context.screening_date.split('@')[0].strip()
+                stime = self.context.screening_date.split('@')[1].strip()
             return """
 <br /><br /><br /><br /><font size='12'>
 Dear %s,
 <br /><br />
-You are invited for your screening exercise.
+You are invited to the Ambrose Alli University %s Admissions Screening Exercise.
 <br /><br />
-<strong>Date/Time: %s
+<strong>Date: %s
+<br /><br />
+Time: %s
 <br /><br />
 Venue: %s
 </strong>
 <br /><br />
-Please bring along this letter of invitation on your screening date.
+Please bring along this letter of invitation and  your downloaded application form on your screening date.
 </font>
 
-""" % (self.context.display_fullname,
-       self.context.screening_date,
+""" % (
+       self.context.display_fullname,
+       session,
+       sdate,
+       stime,
        self.context.screening_venue)
         return

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

@@ -74 +74 @@
     def test_screening_invitation_download(self):
         self.login()
-        self.applicant.screening_date = u'29th August 2016 / 8:30 am'
+        self.applicant.screening_date = u'29th August 2016 @ 8:30 am'
         self.applicant.screening_venue = u'Main Auditorium'
         self.applicant.lastname = u'Cox'