Changeset 16235 for main/waeup.kofa/trunk/src/waeup/kofa/browser

Timestamp:

14 Sep 2020, 06:28:19 (4 years ago)

Author:

Henrik Bettermann

Message:

Improve transcript application record listing.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/browser

Files:

• pages.py (modified) (3 diffs)
• templates/mytranscriptrequests.pt (modified) (1 diff)
• viewlets.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py

@@ -398 +398 @@
                 # Redirect some officers after login
                 local_roles = get_user_account(self.request).getLocalRoles()
+                site_roles = get_user_account(self.request).roles
                 if local_roles.has_key('waeup.local.Lecturer'):
                     self.redirect(self.application_url() + '/my_courses')
                     return
-                if local_roles.has_key('waeup.local.TranscriptOfficer'):
+                if local_roles.has_key('waeup.local.TranscriptOfficer') \
+                    or 'waeup.TranscriptOfficer' in site_roles:
                     self.redirect(self.application_url() + '/my_transcript_requests')
                     return
@@ -1113 +1115 @@
             state=(SUBMITTED, SUBMITTED))
         local_roles = self.local_roles.get('waeup.local.TranscriptOfficer', [])
+        submission_date = ''
+        for applicant in results:
+            if 'submitted' in applicant.history.messages[-1]:
+                submission_date = applicant.history.messages[-1][0:10]
+            applicants.append((applicant, submission_date))
+        # Filter applicants with repect to officer's local role in faculties.
         if not local_roles:
-            return results
+            return applicants
+        filtered_applicants = []
         for item in local_roles:
             if isinstance(item, Faculty):
@@ -1120 +1129 @@
             else:
                 continue
-            for applicant in results:
-                course = getattr(applicant, 'course_studied', None)
-                if not course:
+            for applicant in applicants:
+                course = getattr(applicant[0], 'course_studied', None)
+                if course is None:
+                    filtered_applicants.append(applicant)
                     continue
                 try:
                     if course.__parent__.__parent__.__parent__.code == faccode:
-                        applicants.append(applicant)
+                        filtered_applicants.append(applicant)
                 except AttributeError:
                     continue
-        return applicants
+        return filtered_applicants
 
 class TranscriptSigneeLandingPage(KofaPage):

main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/mytranscriptrequests.pt

@@ -8 +8 @@
     <th i18n:translate="">Applicant Id</th>
     <th i18n:translate="">Full Name</th>
+    <th i18n:translate="">Course Studied</th>
+    <th i18n:translate="">Submission Date</th>
   </tr>
   </thead>
   <tbody>
   <tr tal:repeat="item view/getApplicants">
-    <td> <a tal:attributes="href python:view.url(item)">
-      <span tal:content="item/applicant_id">XXXX_1234</span></a>
+    <td> <a tal:attributes="href python:view.url(item[0])">
+      <span tal:content="python:item[0].applicant_id">XXXX_1234</span></a>
     </td>
-    <td tal:content="item/display_fullname">Bob</td>
+    <td tal:content="python:item[0].display_fullname">Bob</td>
+    <td tal:content="python:getattr(item[0].course_studied,'title',None)">Bob</td>
+    <td tal:content="python:item[1]">Bob</td>
   </tr>
   </tbody>

main/waeup.kofa/trunk/src/waeup/kofa/browser/viewlets.py

@@ -379 +379 @@
         if user_account:
             local_roles = user_account.getLocalRoles()
-            if local_roles.has_key('waeup.local.TranscriptOfficer'):
+            site_roles = user_account.roles
+            if local_roles.has_key('waeup.local.TranscriptOfficer') \
+                or 'waeup.TranscriptOfficer' in site_roles:
                 url = self.view.url(grok.getSite(), self.link)
                 text = translate(self.text, context=self.request)