Changeset 13997 for main/waeup.aaue/trunk/src/waeup

Timestamp:

28 Jun 2016, 17:00:24 (8 years ago)

Author:

Henrik Bettermann

Message:

Add button.

Location:

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

Files:

• applicants/browser.py (modified) (4 diffs)
• applicants/tests/test_browser.py (modified) (1 diff)
• students/browser.py (modified) (1 diff)

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

@@ -33 +33 @@
 from waeup.kofa.interfaces import IPDF
 from waeup.kofa.applicants.interfaces import IApplicant
+from waeup.kofa.browser.viewlets import ManageActionButton
 from waeup.aaue.interfaces import MessageFactory as _
 from kofacustom.nigeria.applicants.browser import (
@@ -344 +345 @@
     grok.template('applicantcheckstatus')
 
+class PaymentReceiptActionButton(ManageActionButton):
+    grok.order(8) # This button should always be the last one.
+    grok.context(ICustomApplicant)
+    grok.view(CustomApplicantDisplayFormPage)
+    grok.require('waeup.viewApplication')
+    icon = 'actionicon_pdf.png'
+    text = _('Download screening invitation letter')
+    target = 'screening_invitation.pdf'
+
+    @property
+    def target_url(self):
+        if not self.context.screening_date:
+            return ''
+        return self.view.url(self.view.context, self.target)
 
 class ExportScreeningInvitationLetter(UtilityView, grok.View):
@@ -349 +364 @@
     This form page is available only in AAUE.
     """
-    grok.context(IApplicant)
+    grok.context(ICustomApplicant)
     grok.name('screening_invitation.pdf')
     grok.require('waeup.viewApplication')
@@ -364 +379 @@
 <br /><br /><br /><br /><font size='12'>
 Dear %s,
-<br /><br /><br />
-You are invited for your screening exercise on:
 <br /><br />
-<strong>%s</strong>.
+You are invited for your screening exercise.
 <br /><br />
-Please bring along this letter of invitation to the %s
+<strong>Date/Time: %s
 <br /><br />
-on your screening date.
-<br /><br /><br />
-Signed,
+Venue: %s
+</strong>
 <br /><br />
-xyz<br />
+Please bring along this letter of invitation on your screening date.
 </font>
 

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

@@ -72 +72 @@
         return
 
-    def test_screening_slip_download(self):
+    def test_screening_invitation_download(self):
         self.login()
-        self.applicant.screening_date = u'29th August 2016'
+        self.applicant.screening_date = u'29th August 2016 / 8:30 am'
         self.applicant.screening_venue = u'Main Auditorium'
         self.applicant.lastname = u'Cox'
         self.applicant.firstname = u'Jo'
         self.applicant.email = 'xx@yy.zz'
-        self.browser.open(self.view_path + '/screening_invitation.pdf')
+        self.browser.open(self.view_path)
+        self.browser.getLink("screening invitation").click()
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(

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

@@ -687 +687 @@
             tickets.append(row)
             no += 1
-        return header + sorted(tickets, key=lambda value: value[5] + value[3])
-
+        return header + sorted(tickets,
+            key=lambda value: value[5] + str(value[6]) + value[3])
+