Changeset 15150 for main/waeup.kofa/branches

Timestamp:

19 Sep 2018, 11:11:38 (6 years ago)

Author:

Henrik Bettermann

Message:

Print electronic signatures on pdf files.

Remove final transcript file when resetting the transcript process.

Location:

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

Files:

• browser.py (modified) (7 diffs)
• tests/test_browser.py (modified) (3 diffs)
• utils.py (modified) (2 diffs)
• viewlets.py (modified) (5 diffs)
• workflow.py (modified) (2 diffs)

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

@@ -1188 +1188 @@
         if prev_transcript_signees == None:
             prev_transcript_signees = ''
-        self.context.student.transcript_signees = '''Signed by %s (%s) on %s
-
-%s''' % (self.request.principal.title, self.request.principal.id, today,
-            prev_transcript_signees)
+        self.context.student.transcript_signees = (
+            u"Electronically signed by %s (%s) on %s\n%s"
+            % (self.request.principal.title, self.request.principal.id, today,
+            prev_transcript_signees))
+        self.redirect(self.url(self.context) + '/transcript')
         return
 
@@ -1221 +1222 @@
             self.correspondence = ''
         if self.context.transcript_signees is not None:
-            self.signees = self.context.transcript_signees.replace('\n', '<br>')
+            self.signees = self.context.transcript_signees.replace(
+                '\n', '<br><br>')
         else:
             self.signees = ''
@@ -1243 +1245 @@
         self.context.writeLogMessage(
             self, 'comment: %s' % comment.replace('\n', '<br>'))
-        # Show and produce transcript file
+        # Produce transcript file
         self.redirect(self.url(self.context) + '/studycourse/transcript.pdf')
         return
@@ -1273 +1275 @@
 
     def update(self):
-        if not self.context.student.transcript_enabled:
-            self.flash(_('You are not allowed to view the transcript.'),
-                       type="warning")
+        final_slip = getUtility(IExtFileStore).getFileByContext(
+            self.context.student, attr='final_transcript')
+        if not self.context.student.transcript_enabled or final_slip:
+            self.flash(_('Forbidden!'), type="warning")
             self.redirect(self.url(self.context))
             return
@@ -1306 +1309 @@
 
     def update(self):
-        if not self.context.student.transcript_enabled:
-            self.flash(_('You are not allowed to download the transcript.'),
-                       type="warning")
+        final_slip = getUtility(IExtFileStore).getFileByContext(
+            self.context.student, attr='final_transcript')
+        if not self.context.student.transcript_enabled \
+            or final_slip:
+            self.flash(_('Forbidden!'), type="warning")
             self.redirect(self.url(self.context))
             return
@@ -1327 +1332 @@
 
     def _sigsInFooter(self):
+        if self.context.student.transcript_signees:
+            return ()
         return (_('CERTIFIED TRUE COPY'),)
 
     def _signatures(self):
-        return None
+        return ()
+
+    def _digital_sigs(self):
+        if self.context.student.transcript_signees:
+            return self.context.student.transcript_signees #.split('\n')
+        return ()
 
     def _save_file(self):
@@ -1364 +1376 @@
             signatures=self._signatures(),
             sigs_in_footer=self._sigsInFooter(),
+            digital_sigs=self._digital_sigs(),
             save_file=self._save_file(),
             )

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

@@ -2192 +2192 @@
         prmglobal.assignRoleToPrincipal('waeup.TranscriptSignee', 'mrtranscript')
         self.browser.open(self.studycourse_path + '/transcript')
-        self.browser.getLink("Sign transcript").click()
+        self.browser.getLink("Sign transcript electronically").click()
         # Transcript signing has been logged ...
         logfile = os.path.join(
@@ -2200 +2200 @@
             'mrtranscript - students.browser.StudentTranscriptSignView - '
             'K1000000 - Transcript signed' in logcontent)
-        # ... and appears in the student's history
+        # ... appears in the student's history ...
         self.browser.open(self.history_path)
         self.assertTrue('Transcript signed by Ruth Gordon'
             in self.browser.contents)
+        # ... and is also stored in the transcript_signee attribute.
+        self.assertTrue(
+            u'Electronically signed by Ruth Gordon (mrtranscript) on '
+            in self.student.transcript_signees)
         # Officer can release the transcript
         self.browser.open(self.student_path)
@@ -2245 +2249 @@
         self.assertEqual(self.browser.headers['Content-Type'],
                          'application/pdf')
+        # Transcript views are no longer accesssible
+        self.browser.open(self.student_path)
+        self.assertFalse('studycourse/transcript' in self.browser.contents)
+        self.browser.open(self.studycourse_path)
+        self.assertFalse('studycourse/transcript' in self.browser.contents)
+        self.browser.open(self.studycourse_path + '/transcript')
+        self.assertTrue('Forbidden!' in self.browser.contents)
+        self.browser.open(self.studycourse_path + '/transcript.pdf')
+        self.assertTrue('Forbidden!' in self.browser.contents)
+        # If we reset the transcript process
+        # (can't be done by transcript officer), the file will be deleted
+        IWorkflowInfo(self.student).fireTransition('reset11')
+        self.browser.open(self.student_path)
+        self.assertFalse('Final Transcript' in self.browser.contents)
+
 
 class StudentUITests(StudentsFullSetup):

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

@@ -867 +867 @@
                   student=None,
                   studentview=None,
-                  note=None, signatures=None, sigs_in_footer=(),
+                  note=None,
+                  signatures=(),
+                  sigs_in_footer=(),
+                  digital_sigs=(),
                   show_scans=True, topMargin=1.5,
                   omit_fields=(),
@@ -967 +970 @@
                 signaturetables = get_signature_tables(signature)
                 data.append(signaturetables[0])
+
+        # Insert digital signatures
+        if digital_sigs:
+            data.append(Spacer(1, 20))
+            sigs = digital_sigs.split('\n')
+            for sig in sigs:
+                data.append(Paragraph(sig, NOTE_STYLE))
 
         view.response.setHeader(

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

@@ -40 +40 @@
 from waeup.kofa.students.workflow import (
     ADMITTED, PAID, REQUESTED, CLEARED, REGISTERED, VALIDATED, GRADUATED,
-    TRANSREQ, TRANSVAL)
+    TRANSREQ, TRANSVAL, TRANSREL)
 from waeup.kofa.university.interfaces import ICourse
 
@@ -738 +738 @@
     @property
     def target_url(self):
-        if self.context.student.transcript_enabled:
+        final_slip = getUtility(IExtFileStore).getFileByContext(
+            self.context.student, attr='final_transcript')
+        if self.context.student.transcript_enabled and not final_slip:
             return self.view.url(self.view.context, self.target)
         return False
@@ -810 +812 @@
     @property
     def target_url(self):
-        if self.context.student.transcript_enabled:
+        final_slip = getUtility(IExtFileStore).getFileByContext(
+            self.context.student, attr='final_transcript')
+        if self.context.student.transcript_enabled \
+            and not final_slip:
             return self.view.url(self.view.context, self.target)
         return False
@@ -820 +825 @@
     grok.view(StudyCourseTranscriptPage)
     grok.require('waeup.signTranscript')
-    text = _('Sign transcript')
+    text = _('Sign transcript electronically')
     target = 'sign_transcript'
     icon = 'actionicon_transcript.png'
@@ -833 +838 @@
     def onclick(self):
         return "return window.confirm(%s);" % _(
-            "'Signing a transcript cannot be revoked."
-            "\\n\\n"
+            "'Signing a transcript electronically cannot be revoked. "
+            "The electronic signature replaces your handwritten signature.\\n\\n"
             "You really want to sign the transcript?'")
 

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

@@ -9 +9 @@
     IObjectHistory, IKofaWorkflowInfo, IKofaUtils,
     CREATED, ADMITTED, CLEARANCE, REQUESTED, CLEARED, PAID, RETURNING,
-    REGISTERED, VALIDATED, GRADUATED, TRANSREQ, TRANSVAL, TRANSREL)
+    REGISTERED, VALIDATED, GRADUATED, TRANSREQ, TRANSVAL, TRANSREL,
+    IExtFileStore)
 from waeup.kofa.interfaces import MessageFactory as _
 from waeup.kofa.workflow import KofaWorkflow, KofaWorkflowInfo
@@ -296 +297 @@
             level_object.validated_by = None
             level_object.validation_date = None
+    elif event.transition.transition_id == 'reset11':
+        transcript_file = getUtility(IExtFileStore).getFileByContext(
+            obj, attr='final_transcript')
+        if transcript_file:
+            getUtility(IExtFileStore).deleteFileByContext(
+                obj, attr='final_transcript')
     # In some tests we don't have a students container
     try: