Changeset 14642

Timestamp:

22 Mar 2017, 10:24:10 (8 years ago)

Author:

Henrik Bettermann

Message:

Add course_category attribute to course tickets. In the base package,
this attribute is omitted from display and manage pages.

Location:

main/waeup.kofa/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• src/waeup/kofa/students/batching.py (modified) (1 diff)
• src/waeup/kofa/students/browser.py (modified) (3 diffs)
• src/waeup/kofa/students/interfaces.py (modified) (2 diffs)
• src/waeup/kofa/students/studylevel.py (modified) (1 diff)
• src/waeup/kofa/students/tests/test_browser.py (modified) (1 diff)
• src/waeup/kofa/students/tests/test_export.py (modified) (8 diffs)

main/waeup.kofa/trunk/CHANGES.txt

@@ -4 +4 @@
 1.6.dev0 (unreleased)
 =======================
+
+* Add `course_category` attribute to course tickets. In the base package,
+  this attribute is omitted from display and manage pages.
 
 * Add `course_category` attribute to certificate courses.

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

@@ -658 +658 @@
             'student_id','reg_number','matric_number',
             'mandatory', 'score', 'carry_over', 'automatic',
-            'outstanding', 'level_session',
+            'outstanding', 'course_category', 'level_session',
             'title', 'credits', 'passmark', 'semester'
             ] + self.additional_fields

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

@@ -132 +132 @@
         value_dict['outstanding'] = translate(str(value.outstanding), 'zope',
             target_language=lang)
+        value_dict['course_category'] = translate(str(value.course_category), 
+            'zope', target_language=lang)
         value_dict['automatic'] = translate(str(value.automatic), 'zope',
             target_language=lang)
@@ -1658 +1660 @@
     grok.name('index')
     grok.require('waeup.viewStudent')
-    form_fields = grok.AutoFields(ICourseTicket)
+    form_fields = grok.AutoFields(ICourseTicket).omit('course_category')
     grok.template('courseticketpage')
     pnav = 4
@@ -1674 +1676 @@
     grok.name('manage')
     grok.require('waeup.manageStudent')
-    form_fields = grok.AutoFields(ICourseTicket)
+    form_fields = grok.AutoFields(ICourseTicket).omit('course_category')
     form_fields['title'].for_display = True
     form_fields['fcode'].for_display = True

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

@@ -34 +34 @@
     IPaymentsContainer, IOnlinePayment)
 from waeup.kofa.university.vocabularies import (
-    CourseSource, StudyModeSource, CertificateSource, SemesterSource,
+    CourseSource, StudyModeSource, CertificateSource,
+    SemesterSource, CourseCategorySource
     )
 
@@ -697 +698 @@
         )
 
+    course_category = schema.Choice(
+        title = _(u'Course Category'),
+        source = CourseCategorySource(),
+        required = False,
+        )
+
     score = schema.Int(
         title = _(u'Score'),

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

@@ -264 +264 @@
                 ticket.mandatory = val.mandatory
                 ticket.carry_over = False
+                ticket.course_category = val.course_category
                 self.addCourseTicket(ticket, val.course)
         return

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

@@ -2519 +2519 @@
         self.assertTrue(
             self.student['studycourse']['200']['COURSE1'].carry_over is True)
+        self.assertTrue(
+            self.student['studycourse']['200']['COURSE1'].course_category is None)
         # Students can open the pdf course registration slip
         self.browser.open(self.student_path + '/studycourse/200')

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

@@ -613 +613 @@
         self.assertEqual(
             result,
-            'automatic,carry_over,code,credits,dcode,fcode,level,level_session,'
+            'automatic,carry_over,code,course_category,credits,dcode,fcode,level,level_session,'
             'mandatory,outstanding,passmark,score,semester,title,student_id,certcode,'
             'display_fullname\r\n'
-            '0,0,,,,,,,0,0,,,,,,,\r\n'
+            '0,0,,,,,,,,0,0,,,,,,,\r\n'
             )
         return
@@ -632 +632 @@
         self.assertEqual(
             result,
-            'automatic,carry_over,code,credits,dcode,fcode,level,level_session,'
+            'automatic,carry_over,code,course_category,credits,dcode,fcode,level,level_session,'
             'mandatory,outstanding,passmark,score,semester,title,student_id,certcode,'
             'display_fullname\r\n'
-            '1,1,CRS1,100,DEP1,FAC1,100,2012,0,0,100,,2,Course 1,A111111,CERT1,'
+            '1,1,CRS1,,100,DEP1,FAC1,100,2012,0,0,100,,2,Course 1,A111111,CERT1,'
             'Anna M. Tester\r\n'
             )
@@ -649 +649 @@
         self.assertEqual(
             result,
-            'automatic,carry_over,code,credits,dcode,fcode,level,level_session,'
+            'automatic,carry_over,code,course_category,credits,dcode,fcode,level,level_session,'
             'mandatory,outstanding,passmark,score,semester,title,student_id,certcode,'
             'display_fullname\r\n'
-            '1,1,CRS1,100,DEP1,FAC1,100,2012,0,0,100,,2,Course 1,A111111,CERT1,'
+            '1,1,CRS1,,100,DEP1,FAC1,100,2012,0,0,100,,2,Course 1,A111111,CERT1,'
             'Anna M. Tester\r\n'
             )
@@ -665 +665 @@
         self.assertEqual(
             result,
-            'automatic,carry_over,code,credits,dcode,fcode,level,level_session,'
+            'automatic,carry_over,code,course_category,credits,dcode,fcode,level,level_session,'
             'mandatory,outstanding,passmark,score,semester,title,student_id,certcode,'
             'display_fullname\r\n'
-            '1,1,CRS1,100,DEP1,FAC1,100,2012,0,0,100,,2,Course 1,A111111,CERT1,'
+            '1,1,CRS1,,100,DEP1,FAC1,100,2012,0,0,100,,2,Course 1,A111111,CERT1,'
             'Anna M. Tester\r\n'
             )
@@ -685 +685 @@
         self.assertEqual(
             result,
-            'automatic,carry_over,code,credits,dcode,fcode,level,level_session,'
+            'automatic,carry_over,code,course_category,credits,dcode,fcode,level,level_session,'
             'mandatory,outstanding,passmark,score,semester,title,student_id,certcode,'
             'display_fullname\r\n'
-            '1,1,CRS1,100,DEP1,FAC1,100,2012,0,0,100,,2,Course 1,A111111,CERT1,'
+            '1,1,CRS1,,100,DEP1,FAC1,100,2012,0,0,100,,2,Course 1,A111111,CERT1,'
             'Anna M. Tester\r\n'
             )
@@ -699 +699 @@
         self.assertEqual(
             result,
-            'automatic,carry_over,code,credits,dcode,fcode,level,level_session,'
+            'automatic,carry_over,code,course_category,credits,dcode,fcode,level,level_session,'
             'mandatory,outstanding,passmark,score,semester,title,student_id,certcode,'
             'display_fullname\r\n'
-            '1,1,CRS1,100,DEP1,FAC1,100,2012,0,0,100,,2,Course 1,A111111,CERT1,'
+            '1,1,CRS1,,100,DEP1,FAC1,100,2012,0,0,100,,2,Course 1,A111111,CERT1,'
             'Anna M. Tester\r\n'
             )
@@ -710 +710 @@
         self.assertEqual(
             result,
-            'automatic,carry_over,code,credits,dcode,fcode,level,level_session,'
+            'automatic,carry_over,code,course_category,credits,dcode,fcode,level,level_session,'
             'mandatory,outstanding,passmark,score,semester,title,student_id,certcode,'
             'display_fullname\r\n'
@@ -723 +723 @@
         self.assertEqual(
             result,
-            'automatic,carry_over,code,credits,dcode,fcode,level,level_session,'
+            'automatic,carry_over,code,course_category,credits,dcode,fcode,level,level_session,'
             'mandatory,outstanding,passmark,score,semester,title,student_id,certcode,'
             'display_fullname\r\n'
-            '1,1,CRS1,100,DEP1,FAC1,110,2012,0,0,100,,2,Course 1,A111111,CERT1,'
+            '1,1,CRS1,,100,DEP1,FAC1,110,2012,0,0,100,,2,Course 1,A111111,CERT1,'
             'Anna M. Tester\r\n'
             )