Changeset 15333

Timestamp:

17 Feb 2019, 10:51:02 (6 years ago)

Author:

Henrik Bettermann

Message:

Add transcript_remark field to study levels. Add page to allow
transcript officers editing the field during transcript processing.

Tests will follow!

Location:

main/waeup.kofa/trunk

Files:

• CHANGES.txt (modified) (2 diffs)
• src/waeup/kofa/students/browser.py (modified) (3 diffs)
• src/waeup/kofa/students/browser_templates/studylevelremarkpage.pt (added)
• src/waeup/kofa/students/browser_templates/transcriptprocess.pt (modified) (2 diffs)
• src/waeup/kofa/students/interfaces.py (modified) (1 diff)
• src/waeup/kofa/students/permissions.py (modified) (1 diff)
• src/waeup/kofa/students/tests/test_export.py (modified) (6 diffs)
• src/waeup/kofa/students/utils.py (modified) (1 diff)

main/waeup.kofa/trunk/CHANGES.txt

@@ -4 +4 @@
 1.6.1.dev0 (unreleased)
 =======================
+
+* Add `transcript_remark` field to study levels. Add page to allow
+  transcript officers editing the field during transcript processing.
 
 * Increase password strength. Officers are now required
@@ -77 +80 @@
   faculty_code *and* department_code in create mode.
 
-* Add 'Update all tickets' button to StudyLevelEditFormPage.
+* Add 'Update all tickets' button to `StudyLevelEditFormPage`.
 
 * Do not allow to create more than 10 students with a single request to

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

@@ -1203 +1203 @@
     pnav = 4
 
+    @property
+    def remarks(self):
+        portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
+        levelremarks = ''
+        studylevelsource = StudyLevelSource().factory
+        for studylevel in self.context.values():
+            leveltitle = studylevelsource.getTitle(
+                self.context, studylevel.level)
+            url = self.url(self.context) + '/%s/remark' % studylevel.level
+            button_title = translate(
+                _('Edit'), 'waeup.kofa', target_language=portal_language)
+            levelremarks += (
+                '<tr>'
+                '<td>%s:</td>'
+                '<td>%s</td> '
+                '<td><a class="btn btn-primary btn-xs" href="%s">%s</a></td>'
+                '</tr>'
+                ) % (
+                leveltitle, studylevel.transcript_remark, url, button_title)
+        return levelremarks
+
     def update(self, SUBMIT=None):
         super(StudentTranscriptValidateFormPage, self).update()
@@ -1252 +1273 @@
     buttonname = _('Save comment and release transcript')
     pnav = 4
+
+    @property
+    def remarks(self):
+        levelremarks = ''
+        studylevelsource = StudyLevelSource().factory
+        for studylevel in self.context.values():
+            leveltitle = studylevelsource.getTitle(
+                self.context, studylevel.level)
+            levelremarks += "%s: %s <br><br>" % (
+                leveltitle, studylevel.transcript_remark)
+        return levelremarks
 
     def update(self, SUBMIT=None):
@@ -1651 +1683 @@
                 (', '.join(deleted), self.context.level))
         self.redirect(self.url(self.context, u'@@manage')+'#tab2')
+        return
+
+class StudyLevelRemarkFormPage(KofaEditFormPage):
+    """ Page to edit the student study level transcript remark only
+    """
+    grok.context(IStudentStudyLevel)
+    grok.name('remark')
+    grok.require('waeup.processTranscript')
+    grok.template('studylevelremarkpage')
+    form_fields = grok.AutoFields(IStudentStudyLevel).omit('level')
+    form_fields['level_session'].for_display = True
+    form_fields['level_verdict'].for_display = True
+    form_fields['validation_date'].for_display = True
+    form_fields['validated_by'].for_display = True
+
+    def update(self, ADD=None, course=None):
+        if self.context.student.studycourse_locked:
+            emit_lock_message(self)
+            return
+        super(StudyLevelRemarkFormPage, self).update()
+
+    @property
+    def label(self):
+        lang = self.request.cookies.get('kofa.language')
+        level_title = translate(self.context.level_title, 'waeup.kofa',
+            target_language=lang)
+        return _('Edit transcript remark of level ${a}', mapping = {'a':level_title})
+
+    @property
+    def translated_values(self):
+        return translated_values(self)
+
+    @action(_('Save remark and go and back to transcript validation page'),
+        style='primary')
+    def save(self, **data):
+        msave(self, **data)
+        self.redirect(
+            self.url(self.context.student, 'studycourse/validate_transcript')
+            +'#tab4')
         return
 

main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/transcriptprocess.pt

@@ -15 +15 @@
       <a href="#tab3" data-toggle="tab">
         <span i18n:translate="">View signatures</span>
+      </a>
+    </li>
+    <li>
+      <a href="#tab4" data-toggle="tab">
+        <span i18n:translate="">View remarks</span>
       </a>
     </li>
@@ -50 +55 @@
       <br /><p tal:content="structure view/signees"></p>
     </div>
+
+    <div id="tab4" class="tab-pane">
+      <br />
+      <table class="table-condensed">
+        <tbody>
+          <span tal:omit-tag="" tal:content="structure view/remarks"></span>
+        </tbody>
+      </table>
+    </div>
   </div>
 

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

@@ -614 +614 @@
         )
 
+    transcript_remark = schema.TextLine(
+        title = _(u'Transcript Remark'),
+        required = False,
+        readonly = False,
+        )
+
     def addCourseTicket(ticket, course):
         """Add a course ticket object.

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

@@ -159 +159 @@
     """The Transcript Officer is allowed to view, to validate and to
     release student transcripts. The officer is not allowed to
-    manage student data.
+    manage student data but to edit the transcript remark on a separate
+    manage page.
     """
     grok.name('waeup.TranscriptOfficer')

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

@@ -490 +490 @@
             result,
             'gpa,level,level_session,level_verdict,total_credits,'
-            'validated_by,validation_date,'
+            'transcript_remark,validated_by,validation_date,'
             'student_id,number_of_tickets,certcode\r\n'
-            '0.00,,,0,0,,,,0,\r\n'
+            '0.00,,,0,0,,,,,0,\r\n'
             )
         return
@@ -508 +508 @@
             result,
             'gpa,level,level_session,level_verdict,total_credits,'
-            'validated_by,validation_date,'
+            'transcript_remark,validated_by,validation_date,'
             'student_id,number_of_tickets,certcode\r\n'
-            '0.00,100,2012,A,100,,,A111111,1,CERT1\r\n'
+            '0.00,100,2012,A,100,,,,A111111,1,CERT1\r\n'
             )
         return
@@ -524 +524 @@
             result,
             'gpa,level,level_session,level_verdict,total_credits,'
-            'validated_by,validation_date,'
+            'transcript_remark,validated_by,validation_date,'
             'student_id,number_of_tickets,certcode\r\n'
-            '0.00,100,2012,A,100,,,A111111,1,CERT1\r\n'
+            '0.00,100,2012,A,100,,,,A111111,1,CERT1\r\n'
             )
         return
@@ -539 +539 @@
             result,
             'gpa,level,level_session,level_verdict,total_credits,'
-            'validated_by,validation_date,'
+            'transcript_remark,validated_by,validation_date,'
             'student_id,number_of_tickets,certcode\r\n'
-            '0.00,100,2012,A,100,,,A111111,1,CERT1\r\n'
+            '0.00,100,2012,A,100,,,,A111111,1,CERT1\r\n'
             )
         return
@@ -558 +558 @@
             result,
             'gpa,level,level_session,level_verdict,total_credits,'
-            'validated_by,validation_date,'
+            'transcript_remark,validated_by,validation_date,'
             'student_id,number_of_tickets,certcode\r\n'
-            '0.00,100,2012,A,100,,,A111111,1,CERT1\r\n'
+            '0.00,100,2012,A,100,,,,A111111,1,CERT1\r\n'
             )
         return
@@ -577 +577 @@
             result,
             'gpa,level,level_session,level_verdict,total_credits,'
-            'validated_by,validation_date,'
+            'transcript_remark,validated_by,validation_date,'
             'student_id,number_of_tickets,certcode\r\n'
-            '0.00,100,2012,A,100,,,A111111,1,CERT1\r\n'
+            '0.00,100,2012,A,100,,,,A111111,1,CERT1\r\n'
             )
         return

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

@@ -295 +295 @@
         #sgpa = '%s: %.2f' % (trans('Sessional GPA (rectified)', lang), level['sgpa'])
         data.append(Paragraph(sgpa, style["Normal"]))
-        if getattr(level_obj, 'remark', None):
+        if getattr(level_obj, 'transcript_remark', None):
             remark = '%s: %s' % (
-                trans('Remark', lang), getattr(level_obj, 'remark'))
+                trans('Transcript Remark', lang),
+                getattr(level_obj, 'transcript_remark'))
             data.append(Paragraph(remark, style["Normal"]))
     return data