Changeset 14650

Timestamp:

23 Mar 2017, 06:09:02 (8 years ago)

Author:

Henrik Bettermann

Message:

Use and show course categories.

Location:

main/waeup.aaue/trunk/src/waeup/aaue

Files:

• students/browser.py (modified) (3 diffs)
• students/browser_templates/studyleveleditpage.pt (modified) (2 diffs)
• students/browser_templates/studylevelmanagepage.pt (modified) (2 diffs)
• students/browser_templates/studylevelpage.pt (modified) (3 diffs)
• students/reports/tests/test_raw_score_report.py (modified) (4 diffs)
• students/tests/test_export.py (modified) (1 diff)
• utils/utils.py (modified) (1 diff)

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

@@ -455 +455 @@
         Title = translate(_('Title'), target_language=portal_language)
         Cred = translate(_('Cred.'), target_language=portal_language)
+        CC = translate(_('Cat.'), target_language=portal_language)
         if self.show_results:
             Score = translate(_('Score'), target_language=portal_language)
@@ -475 +476 @@
                 tableheader.append([(Code,'code', 2.0),
                                    (Title,'title', 7),
-                                   (Cred, 'credits', 1.5),
+                                   (Cred, 'credits', 1.4),
+                                   (CC, 'course_category', 1.2),
                                    (Score, 'score', 1.4),
                                    #(CA, 'ca', 1.4),
@@ -485 +487 @@
                                    (Title,'title', 7),
                                    (Cred, 'credits', 1.5),
+                                   (CC, 'course_category', 1.2),
                                    (Signature, 'dummy', 3),
                                    ])

main/waeup.aaue/trunk/src/waeup/aaue/students/browser_templates/studyleveleditpage.pt

@@ -20 +20 @@
       <th i18n:translate="">CO</th>
       <th i18n:translate="">OS</th>
+      <th i18n:translate="">CC</th>
     </tr>
   </thead>
@@ -39 +40 @@
       <td tal:content="value/carry_over">CO</td>
       <td tal:content="value/outstanding">OS</td>
+      <td tal:content="value/course_category">CC</td>
     </tr>
   </tbody>

main/waeup.aaue/trunk/src/waeup/aaue/students/browser_templates/studylevelmanagepage.pt

@@ -49 +49 @@
             <th i18n:translate="">CO</th>
             <th i18n:translate="">OS</th>
+            <th i18n:translate="">CC</th>
             <th i18n:translate="">Auto</th>
           </tr>
@@ -71 +72 @@
             <td tal:content="value/carry_over">CO</td>
             <td tal:content="value/outstanding">OS</td>
+            <td tal:content="value/course_category">CC</td>
             <td tal:content="value/automatic">AUTO</td>
           </tr>

main/waeup.aaue/trunk/src/waeup/aaue/students/browser_templates/studylevelpage.pt

@@ -33 +33 @@
       <th i18n:translate="">CO</th>
       <th i18n:translate="">OS</th>
+      <th i18n:translate="">CC</th>
       <th i18n:translate="">Auto</th>
     </tr>
@@ -52 +53 @@
       <td tal:content="value/carry_over">CO</td>
       <td tal:content="value/outstanding">OS</td>
+      <td tal:content="value/course_category|nothing">CC</td>
       <td tal:content="value/automatic">AUTO</td>
     </tr>
@@ -60 +62 @@
   CO: Carry-over course<br />
   OS: Outstanding course<br />
+  CC: Course Category (C, R or E)<br />
   Mand.: Mandatory course<br />
   Auto: Automatically created course ticket

main/waeup.aaue/trunk/src/waeup/aaue/students/reports/tests/test_raw_score_report.py

@@ -38 +38 @@
         rsr =  CustomRawScoreReport('fac1', 'dep1', 'CERT1', 2010, 100)
         result = rsr._get_courses('fac1', 'dep1', 'CERT1', 2010, 100)
-        self.assertEqual(result, [u'Course1'])
+        self.assertEqual(result, [self.certificate.values()[0]])
+        self.assertEqual(
+            result,
+            [self.app['faculties']['fac1']['dep1'].certificates[
+                'CERT1']['Course1_100']])
         return
 
@@ -56 +60 @@
 
     def test_create_pdf(self):
+        self.app['faculties']['fac1']['dep1'].certificates[
+                'CERT1']['Course1_100'].course_category = 'xyz'
         self.course2 = createObject('waeup.Course')
         self.course2.code = 'Course2'
@@ -126 +132 @@
         rsr =  GradRawScoreReport('fac1', 'dep1', 'CERT1', 2010, 100)
         result = rsr._get_courses('fac1', 'dep1', 'CERT1', 2010, 100)
-        self.assertEqual(result, [u'Course1'])
+        self.assertEqual(result, [self.certificate.values()[0]])
+        self.assertEqual(
+            result,
+            [self.app['faculties']['fac1']['dep1'].certificates[
+                'CERT1']['Course1_100']])
         return
 
@@ -151 +161 @@
     def test_create_pdf(self):
         self.certificate.end_level = 200
+        self.app['faculties']['fac1']['dep1'].certificates['CERT1']['Course1_100'].course_category = 'xyz'
         self.course2 = createObject('waeup.Course')
         self.course2.code = 'Course2'

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

@@ -192 +192 @@
         self.assertEqual(
             result,
-            'automatic,ca,carry_over,code,credits,dcode,fcode,level,level_session,'
+            'automatic,ca,carry_over,code,course_category,credits,dcode,fcode,level,level_session,'
             'mandatory,outstanding,passmark,score,semester,title,student_id,certcode,'
             'display_fullname,matric_number\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,'
             '"TESTER, Anna M.",234\r\n'
             )

main/waeup.aaue/trunk/src/waeup/aaue/utils/utils.py

@@ -27 +27 @@
 
     PREFERRED_LANGUAGES_DICT = {
+        }
+
+    COURSE_CATEGORY_DICT = {
+        'C':'Core Course (C)',
+        'R':'Required Courses (R)',
+        'E':'Elective Courses (E)',
         }