Changeset 13999


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • main/waeup.aaue/trunk/src/waeup/aaue/applicants/browser.py

    r13997 r13999  
    376376    def note(self):
    377377        if self.context.screening_date:
     378            year = self.context.__parent__.year
     379            session = '%s/%s' % (year, year + 1)
     380            sdate = self.context.screening_date
     381            stime = ''
     382            if '@' in self.context.screening_date:
     383                sdate = self.context.screening_date.split('@')[0].strip()
     384                stime = self.context.screening_date.split('@')[1].strip()
    378385            return """
    379386<br /><br /><br /><br /><font size='12'>
    380387Dear %s,
    381388<br /><br />
    382 You are invited for your screening exercise.
     389You are invited to the Ambrose Alli University %s Admissions Screening Exercise.
    383390<br /><br />
    384 <strong>Date/Time: %s
     391<strong>Date: %s
     392<br /><br />
     393Time: %s
    385394<br /><br />
    386395Venue: %s
    387396</strong>
    388397<br /><br />
    389 Please bring along this letter of invitation on your screening date.
     398Please bring along this letter of invitation and  your downloaded application form on your screening date.
    390399</font>
    391400
    392 """ % (self.context.display_fullname,
    393        self.context.screening_date,
     401""" % (
     402       self.context.display_fullname,
     403       session,
     404       sdate,
     405       stime,
    394406       self.context.screening_venue)
    395407        return
  • main/waeup.aaue/trunk/src/waeup/aaue/applicants/tests/test_browser.py

    r13997 r13999  
    7474    def test_screening_invitation_download(self):
    7575        self.login()
    76         self.applicant.screening_date = u'29th August 2016 / 8:30 am'
     76        self.applicant.screening_date = u'29th August 2016 @ 8:30 am'
    7777        self.applicant.screening_venue = u'Main Auditorium'
    7878        self.applicant.lastname = u'Cox'
Note: See TracChangeset for help on using the changeset viewer.