Changeset 15826 for main

Timestamp:

19 Nov 2019, 13:07:22 (5 years ago)

Author:

Henrik Bettermann

Message:

Move viewlet classes.

Location:

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students

Files:

• browser.py (modified) (3 diffs)
• viewlets.py (modified) (2 diffs)

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/browser.py

@@ -42 +42 @@
     BedTicketAddPage)
 from waeup.kofa.students.interfaces import IStudentsUtils
-from waeup.kofa.students.viewlets import (
-    PaymentReceiptActionButton, StudentPassportActionButton)
 from kofacustom.nigeria.students.interfaces import (
     INigeriaStudentBase, INigeriaStudent, INigeriaStudentPersonal,
@@ -57 +55 @@
     """
     grok.context(INigeriaStudentOnlinePayment)
-
-class PaymentReceiptActionButton(PaymentReceiptActionButton):
-    grok.order(4)
-    grok.context(INigeriaStudentOnlinePayment)
-
-    @property
-    def target_url(self):
-        if not self.context.r_company:
-            return ''
-        return self.view.url(self.view.context, self.target)
-
 
 class NigeriaStudentBaseDisplayFormPage(StudentBaseDisplayFormPage):
@@ -253 +240 @@
         'phone', 'adm_code', 'email', 'date_of_birth', 'current_level',
         'flash_notice')
-
-class StudentPassportActionButton(StudentPassportActionButton):
-
-    @property
-    def target_url(self):
-        # Passport pictures must not be editable if application slip
-        # exists.
-        slip = getUtility(IExtFileStore).getFileByContext(
-            self.context, 'application_slip')
-        PORTRAIT_CHANGE_STATES = getUtility(IStudentsUtils).PORTRAIT_CHANGE_STATES
-        if self.context.state not in PORTRAIT_CHANGE_STATES or slip is not None:
-            return ''
-        return self.view.url(self.view.context, self.target)
 
 class NigeriaStudentFilesUploadPage(StudentFilesUploadPage):

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/viewlets.py

@@ -19 +19 @@
 import grok
 from zope.component import getUtility
+from waeup.kofa.interfaces import IExtFileStore
 from waeup.kofa.browser.viewlets import ManageActionButton
 from waeup.kofa.students.interfaces import IStudentsUtils
+from waeup.kofa.students.viewlets import (
+    PaymentReceiptActionButton, StudentPassportActionButton)
 from waeup.kofa.students.fileviewlets import (
     StudentFileDisplay, StudentFileUpload, StudentImage)
 from waeup.kofa.students.browser import ExportPDFClearanceSlip
-
-from kofacustom.nigeria.students.interfaces import INigeriaStudent
+from kofacustom.nigeria.students.interfaces import (
+    INigeriaStudent, INigeriaStudentOnlinePayment)
 from kofacustom.nigeria.students.browser import NigeriaStudentBaseDisplayFormPage
 from kofacustom.nigeria.interfaces import MessageFactory as _
@@ -38 +41 @@
     return False
 
+class StudentPassportActionButton(StudentPassportActionButton):
+
+    @property
+    def target_url(self):
+        # Passport pictures must not be editable if application slip
+        # exists.
+        slip = getUtility(IExtFileStore).getFileByContext(
+            self.context, 'application_slip')
+        PORTRAIT_CHANGE_STATES = getUtility(IStudentsUtils).PORTRAIT_CHANGE_STATES
+        if self.context.state not in PORTRAIT_CHANGE_STATES or slip is not None:
+            return ''
+        return self.view.url(self.view.context, self.target)
+
+class PaymentReceiptActionButton(PaymentReceiptActionButton):
+    grok.order(4)
+    grok.context(INigeriaStudentOnlinePayment)
+
+    @property
+    def target_url(self):
+        if not self.context.r_company:
+            return ''
+        return self.view.url(self.view.context, self.target)
+
 # Financial Clearance Officer buttons