- Timestamp:
- 23 Mar 2017, 06:09:02 (8 years ago)
- Location:
- main/waeup.aaue/trunk/src/waeup/aaue
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
main/waeup.aaue/trunk/src/waeup/aaue/students/browser.py
r14573 r14650 455 455 Title = translate(_('Title'), target_language=portal_language) 456 456 Cred = translate(_('Cred.'), target_language=portal_language) 457 CC = translate(_('Cat.'), target_language=portal_language) 457 458 if self.show_results: 458 459 Score = translate(_('Score'), target_language=portal_language) … … 475 476 tableheader.append([(Code,'code', 2.0), 476 477 (Title,'title', 7), 477 (Cred, 'credits', 1.5), 478 (Cred, 'credits', 1.4), 479 (CC, 'course_category', 1.2), 478 480 (Score, 'score', 1.4), 479 481 #(CA, 'ca', 1.4), … … 485 487 (Title,'title', 7), 486 488 (Cred, 'credits', 1.5), 489 (CC, 'course_category', 1.2), 487 490 (Signature, 'dummy', 3), 488 491 ]) -
main/waeup.aaue/trunk/src/waeup/aaue/students/browser_templates/studyleveleditpage.pt
r14576 r14650 20 20 <th i18n:translate="">CO</th> 21 21 <th i18n:translate="">OS</th> 22 <th i18n:translate="">CC</th> 22 23 </tr> 23 24 </thead> … … 39 40 <td tal:content="value/carry_over">CO</td> 40 41 <td tal:content="value/outstanding">OS</td> 42 <td tal:content="value/course_category">CC</td> 41 43 </tr> 42 44 </tbody> -
main/waeup.aaue/trunk/src/waeup/aaue/students/browser_templates/studylevelmanagepage.pt
r14614 r14650 49 49 <th i18n:translate="">CO</th> 50 50 <th i18n:translate="">OS</th> 51 <th i18n:translate="">CC</th> 51 52 <th i18n:translate="">Auto</th> 52 53 </tr> … … 71 72 <td tal:content="value/carry_over">CO</td> 72 73 <td tal:content="value/outstanding">OS</td> 74 <td tal:content="value/course_category">CC</td> 73 75 <td tal:content="value/automatic">AUTO</td> 74 76 </tr> -
main/waeup.aaue/trunk/src/waeup/aaue/students/browser_templates/studylevelpage.pt
r14614 r14650 33 33 <th i18n:translate="">CO</th> 34 34 <th i18n:translate="">OS</th> 35 <th i18n:translate="">CC</th> 35 36 <th i18n:translate="">Auto</th> 36 37 </tr> … … 52 53 <td tal:content="value/carry_over">CO</td> 53 54 <td tal:content="value/outstanding">OS</td> 55 <td tal:content="value/course_category|nothing">CC</td> 54 56 <td tal:content="value/automatic">AUTO</td> 55 57 </tr> … … 60 62 CO: Carry-over course<br /> 61 63 OS: Outstanding course<br /> 64 CC: Course Category (C, R or E)<br /> 62 65 Mand.: Mandatory course<br /> 63 66 Auto: Automatically created course ticket -
main/waeup.aaue/trunk/src/waeup/aaue/students/reports/tests/test_raw_score_report.py
r14630 r14650 38 38 rsr = CustomRawScoreReport('fac1', 'dep1', 'CERT1', 2010, 100) 39 39 result = rsr._get_courses('fac1', 'dep1', 'CERT1', 2010, 100) 40 self.assertEqual(result, [u'Course1']) 40 self.assertEqual(result, [self.certificate.values()[0]]) 41 self.assertEqual( 42 result, 43 [self.app['faculties']['fac1']['dep1'].certificates[ 44 'CERT1']['Course1_100']]) 41 45 return 42 46 … … 56 60 57 61 def test_create_pdf(self): 62 self.app['faculties']['fac1']['dep1'].certificates[ 63 'CERT1']['Course1_100'].course_category = 'xyz' 58 64 self.course2 = createObject('waeup.Course') 59 65 self.course2.code = 'Course2' … … 126 132 rsr = GradRawScoreReport('fac1', 'dep1', 'CERT1', 2010, 100) 127 133 result = rsr._get_courses('fac1', 'dep1', 'CERT1', 2010, 100) 128 self.assertEqual(result, [u'Course1']) 134 self.assertEqual(result, [self.certificate.values()[0]]) 135 self.assertEqual( 136 result, 137 [self.app['faculties']['fac1']['dep1'].certificates[ 138 'CERT1']['Course1_100']]) 129 139 return 130 140 … … 151 161 def test_create_pdf(self): 152 162 self.certificate.end_level = 200 163 self.app['faculties']['fac1']['dep1'].certificates['CERT1']['Course1_100'].course_category = 'xyz' 153 164 self.course2 = createObject('waeup.Course') 154 165 self.course2.code = 'Course2' -
main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_export.py
r14622 r14650 192 192 self.assertEqual( 193 193 result, 194 'automatic,ca,carry_over,code,c redits,dcode,fcode,level,level_session,'194 'automatic,ca,carry_over,code,course_category,credits,dcode,fcode,level,level_session,' 195 195 'mandatory,outstanding,passmark,score,semester,title,student_id,certcode,' 196 196 'display_fullname,matric_number\r\n' 197 '1,,1,CRS1, 100,DEP1,FAC1,100,2012,0,0,100,,2,Course 1,A111111,CERT1,'197 '1,,1,CRS1,,100,DEP1,FAC1,100,2012,0,0,100,,2,Course 1,A111111,CERT1,' 198 198 '"TESTER, Anna M.",234\r\n' 199 199 ) -
main/waeup.aaue/trunk/src/waeup/aaue/utils/utils.py
r14621 r14650 27 27 28 28 PREFERRED_LANGUAGES_DICT = { 29 } 30 31 COURSE_CATEGORY_DICT = { 32 'C':'Core Course (C)', 33 'R':'Required Courses (R)', 34 'E':'Elective Courses (E)', 29 35 } 30 36
Note: See TracChangeset for help on using the changeset viewer.