Changeset 15174 for main/waeup.kofa/trunk/src/waeup/kofa

Timestamp:

25 Sep 2018, 11:45:47 (6 years ago)

Author:

Henrik Bettermann

Message:

Implement 2-step validation process.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/students

Files:

• browser.py (modified) (3 diffs)
• browser_templates/transcriptprocess.pt (moved) (moved from main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/transcriptrelease.pt)
• tests/test_browser.py (modified) (2 diffs)

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

@@ -1146 +1146 @@
         return
 
-class StudentTranscriptValidateView(UtilityView, grok.View):
-    """ View to validate transcript
-    """
-    grok.context(IStudentStudyCourse)
-    grok.name('validate_transcript')
-    grok.require('waeup.processTranscript')
-
-    def update(self, SUBMIT=None):
-        if self.context.student.state != TRANSREQ:
-            self.flash(_('Student is in wrong state.'), type="warning")
-            self.redirect(self.url(self.context))
-            return
-        # Fire transition
-        IWorkflowInfo(self.context.student).fireTransition(
-            'validate_transcript')
-        self.flash(_('Transcript validated.'))
-        self.redirect(self.url(self.context) + '/transcript')
-        return
-
-    def render(self):
-        return
-
 class StudentTranscriptSignView(UtilityView, grok.View):
     """ View to sign transcript
@@ -1208 +1186 @@
         return
 
+class StudentTranscriptValidateFormPage(KofaEditFormPage):
+    """ Page to validate transcript
+    """
+    grok.context(IStudentStudyCourse)
+    grok.name('validate_transcript')
+    grok.require('waeup.processTranscript')
+    grok.template('transcriptprocess')
+    label = _('Validate transcript')
+    buttonname = _('Save comment and validate transcript')
+    pnav = 4
+
+    def update(self, SUBMIT=None):
+        super(StudentTranscriptValidateFormPage, self).update()
+        if self.context.student.state != TRANSREQ:
+            self.flash(_('Student is in wrong state.'), type="warning")
+            self.redirect(self.url(self.context))
+            return
+        if getattr(self.context, 'transcript_comment', None) is not None:
+            self.correspondence = self.context.transcript_comment.replace(
+                '\n', '<br>')
+        else:
+            self.correspondence = ''
+        if getattr(self.context, 'transcript_signees', None) is not None:
+            self.signees = self.context.transcript_signees.replace(
+                '\n', '<br><br>')
+        else:
+            self.signees = ''
+        if SUBMIT is None:
+            return
+        # Fire transition
+        IWorkflowInfo(self.context.student).fireTransition('validate_transcript')
+        self.flash(_('Transcript validated.'))
+        comment = self.request.form.get('comment', '').replace('\r', '')
+        tz = getattr(queryUtility(IKofaUtils), 'tzinfo', pytz.utc)
+        today = now(tz).strftime('%d/%m/%Y %H:%M:%S %Z')
+        old_transcript_comment = getattr(
+            self.context, 'transcript_comment', None)
+        if old_transcript_comment == None:
+            old_transcript_comment = ''
+        self.context.transcript_comment = '''On %s %s wrote:
+
+%s
+
+%s''' % (today, self.request.principal.id, comment,
+         old_transcript_comment)
+        self.context.writeLogMessage(
+            self, 'comment: %s' % comment.replace('\n', '<br>'))
+        self.redirect(self.url(self.context) + '/transcript')
+        return
+
 class StudentTranscriptReleaseFormPage(KofaEditFormPage):
     """ Page to release transcript
@@ -1214 +1242 @@
     grok.name('release_transcript')
     grok.require('waeup.processTranscript')
-    grok.template('transcriptrelease')
+    grok.template('transcriptprocess')
     label = _('Release transcript')
     buttonname = _('Save comment and release transcript')

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py

@@ -2179 +2179 @@
         self.browser.open(self.studycourse_path + '/transcript')
         self.browser.getLink("Validate transcript").click()
+        self.browser.getControl("Save comment and validate transcript").click()
         # After validation all manage forms are locked.
         self.browser.open(self.studycourse_path + '/manage')
@@ -2298 +2299 @@
         # Officer is on transcript page and can validate the transcript
         self.browser.getLink("Validate transcript").click()
+        self.browser.getControl("Save comment and validate transcript").click()
         self.assertTrue(
             '<div class="alert alert-success">Transcript validated.</div>'