Changeset 15162 for main/waeup.kofa/branches/henrik-transcript-workflow/src

Timestamp:

21 Sep 2018, 09:32:42 (6 years ago)

Author:

Henrik Bettermann

Message:

Remove manageStudent permission.
Show tables on landing pages.
Adjust tests.

Location:

main/waeup.kofa/branches/henrik-transcript-workflow/src/waeup/kofa

Files:

• browser/templates/mytranscriptrequests.pt (modified) (1 diff)
• students/permissions.py (modified) (2 diffs)
• students/tests/test_browser.py (modified) (6 diffs)

main/waeup.kofa/branches/henrik-transcript-workflow/src/waeup/kofa/browser/templates/mytranscriptrequests.pt

@@ -2 +2 @@
   Transcripts to be validated
 </h3>
-<div tal:repeat="student python:view.getStudents[0]">
-  <a tal:attributes="href python:student.url + '/studycourse/transcript'">
-    <span tal:content="student/display_fullname">FULLNAME</span>
-  </a>
-</div>
+
+<table class="kofa-data-table dataTable" tal:condition="python:view.getStudents[0]">
+  <thead>
+  <tr>
+    <th i18n:translate="">Matric No.</th>
+    <th i18n:translate="">Student Id</th>
+    <th i18n:translate="">Fullname</th>
+    <th i18n:translate="">Faculty</th>
+    <th i18n:translate="">Department</th>
+    <th i18n:translate="">Course of Studies</th>
+  </tr>
+  </thead>
+  <tbody>
+  <tr tal:repeat="student python:view.getStudents[0]">
+    <td tal:content="student/context/matric_number">MATRICNUMBER</td>
+    <td>
+      <a tal:attributes="href python:student.url + '/studycourse/transcript'">
+      <span tal:content="student/student_id">STUDENTID</span>
+      </a>
+    </td>
+    <td tal:content="student/context/display_fullname">FULLNAME</td>
+    <td tal:content="student/context/faccode">FACCODE</td>
+    <td tal:content="student/context/depcode">DEPCODE</td>
+    <td tal:content="student/context/certcode">CERTCODE</td>
+  </tr>
+  </tbody>
+</table>
+
 <h3 i18n:domain="waeup.kofa" i18n:translate="" tal:condition="python:view.getStudents[1]">
   Transcripts to be signed and released
 </h3>
-<div tal:repeat="student python:view.getStudents[1]">
-  <a tal:attributes="href python:student.url + '/studycourse/transcript'">
-    <span tal:content="student/display_fullname">FULLNAME</span>
-    (<span tal:content="student/student_id">ID</span> -
-    <span tal:content="student/matric_number">MATRICNUMBER</span>)
-  </a>,
-  <span tal:content="student/context/faccode">FACCODE</span> /
-  <span tal:content="student/context/depcode">DEPCODE</span> /
-  <span tal:content="student/context/certcode">CERTCODE</span>
-</div>
 
+<table class="kofa-data-table dataTable" tal:condition="python:view.getStudents[1]">
+  <thead>
+  <tr>
+    <th i18n:translate="">Matric No.</th>
+    <th i18n:translate="">Student Id</th>
+    <th i18n:translate="">Fullname</th>
+    <th i18n:translate="">Faculty</th>
+    <th i18n:translate="">Department</th>
+    <th i18n:translate="">Course of Studies</th>
+  </tr>
+  </thead>
+  <tbody>
+  <tr tal:repeat="student python:view.getStudents[1]">
+    <td tal:content="student/context/matric_number">MATRICNUMBER</td>
+    <td>
+      <a tal:attributes="href python:student.url + '/studycourse/transcript'">
+      <span tal:content="student/student_id">STUDENTID</span>
+      </a>
+    </td>
+    <td tal:content="student/context/display_fullname">FULLNAME</td>
+    <td tal:content="student/context/faccode">FACCODE</td>
+    <td tal:content="student/context/depcode">DEPCODE</td>
+    <td tal:content="student/context/certcode">CERTCODE</td>
+  </tr>
+  </tbody>
+</table>

main/waeup.kofa/branches/henrik-transcript-workflow/src/waeup/kofa/students/permissions.py

@@ -158 +158 @@
 class TranscriptOfficer(grok.Role):
     """The Transcript Officer is allowed to view, to validate and to
-    release student transcripts. The officer is also allowed to
+    release student transcripts. The officer is not allowed to
     manage student data.
     """
@@ -168 +168 @@
                      'waeup.viewStudent',
                      'waeup.viewStudentsContainer',
-                     'waeup.manageStudent',
                      )
 

main/waeup.kofa/branches/henrik-transcript-workflow/src/waeup/kofa/students/tests/test_browser.py

@@ -2127 +2127 @@
             'Comment line2\n\nDispatch Address:\nAddress line 1 \n'
             'Address line2\n\n')
-        # Create transcript officer
+        # Create officer with both roles
         self.app['users'].addUser('mrtranscript', 'mrtranscriptsecret')
         self.app['users']['mrtranscript'].email = 'mrtranscript@foo.ng'
@@ -2133 +2133 @@
         prmglobal = IPrincipalRoleManager(self.app)
         prmglobal.assignRoleToPrincipal('waeup.TranscriptOfficer', 'mrtranscript')
-        # Login as transcript officer
+        prmglobal.assignRoleToPrincipal('waeup.StudentsManager', 'mrtranscript')
+        prmglobal.assignRoleToPrincipal('waeup.TranscriptSignee', 'mrtranscript')
+        # Login
         self.browser.open(self.login_path)
         self.browser.getControl(name="form.login").value = 'mrtranscript'
@@ -2186 +2188 @@
         self.browser.open(self.studycourse_path + '/100/COURSE1/manage')
         self.assertTrue('The requested form is locked' in self.browser.contents)
+
         # Transcript can be signed if officer has the permission to sign
-        self.browser.open(self.studycourse_path + '/transcript')
-        self.assertFalse('Sign transcript' in self.browser.contents)
-        prmglobal = IPrincipalRoleManager(self.app)
-        prmglobal.assignRoleToPrincipal('waeup.TranscriptSignee', 'mrtranscript')
+        #self.browser.open(self.studycourse_path + '/transcript')
+        #self.assertFalse('Sign transcript' in self.browser.contents)
+        #prmglobal = IPrincipalRoleManager(self.app)
+        #prmglobal.assignRoleToPrincipal('waeup.TranscriptSignee', 'mrtranscript')
+
         self.browser.open(self.studycourse_path + '/transcript')
         self.browser.getLink("Sign transcript electronically").click()
@@ -2249 +2253 @@
         self.assertEqual(self.browser.headers['Content-Type'],
                          'application/pdf')
-        # Transcript views are no longer accesssible
+        # Transcript views are no longer accessible
         self.browser.open(self.studycourse_path)
         self.assertFalse('studycourse/transcript' in self.browser.contents)
@@ -2289 +2293 @@
             'http://localhost/app/students/K1000000/studycourse/transcript'
             in self.browser.contents)
-        self.browser.getLink("Anna Tester").click()
+        self.browser.getLink("K1000000").click()
         self.assertTrue(
             'Anna Tester: Transcript Data' in self.browser.contents)
@@ -2329 +2333 @@
             'http://localhost/app/students/K1000000/studycourse/transcript'
             in self.browser.contents)
-        self.browser.getLink("Anna Tester").click()
+        self.browser.getLink("K1000000").click()
         self.assertTrue(
             'Anna Tester: Transcript Data' in self.browser.contents)