Changeset 2606
- Timestamp:
- 9 Nov 2007, 12:04:49 (17 years ago)
- Location:
- WAeUP_SRP/base
- Files:
-
- 8 edited
-
WAeUPTables.py (modified) (2 diffs)
-
skins/waeup_academics/level_view.pt (modified) (1 diff)
-
skins/waeup_default/login_staff.pt (modified) (3 diffs)
-
skins/waeup_student/course_registration_slip.pt (modified) (1 diff)
-
skins/waeup_student/getStudyLevelInfo.py (modified) (3 diffs)
-
skins/waeup_student/login_student.pt (modified) (1 diff)
-
skins/waeup_student/student_view.pt (modified) (1 diff)
-
skins/waeup_student/study_level_view.pt (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
WAeUP_SRP/base/WAeUPTables.py
r2579 r2606 1355 1355 course_results = self.course_results.evalAdvancedQuery(query) 1356 1356 carry_overs = [] 1357 normal = [] 1357 normal1 = [] 1358 normal2 = [] 1359 normal3 = [] 1358 1360 credits = 0 1359 1361 for brain in course_results: … … 1373 1375 carry_overs.append(d) 1374 1376 else: 1375 normal.append(d) 1376 normal.sort(cmp=lambda x,y: cmp("%(semester)s%(code)s" % x, 1377 "%(semester)s%(code)s" % y)) 1377 if brain.semester == '1': 1378 normal1.append(d) 1379 elif brain.semester == '2': 1380 normal2.append(d) 1381 else: 1382 normal3.append(d) 1383 #normal.sort(cmp=lambda x,y: cmp("%(semester)s%(code)s" % x, 1384 # "%(semester)s%(code)s" % y)) 1378 1385 carry_overs.sort(cmp=lambda x,y: cmp("%(semester)s%(code)s" % x, 1379 1386 "%(semester)s%(code)s" % y)) 1380 return credits,carry_overs,normal 1387 return credits,carry_overs,normal1,normal2,normal3 1381 1388 ###) 1382 1389 -
WAeUP_SRP/base/skins/waeup_academics/level_view.pt
r1783 r2606 23 23 <table tal:condition="python: 1" class="contentListing" width="100%" summary="content layout" id="folder_content"> 24 24 <span tal:repeat="sem python:('first','second')"> 25 <t r><th colspan="3" tal:content="python: test(sem == 'first','First Semester', 'Second Semester')" />25 <th colspan="3" tal:content="python: test(sem == 'first','First Semester', 'Second Semester')" /> 26 26 <tr tal:repeat="row python: info[sem]" 27 27 tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')"> -
WAeUP_SRP/base/skins/waeup_default/login_staff.pt
r1826 r2606 34 34 <td> 35 35 <input type="password" id="password" name="__ac_password" size="20" 36 value="" /> </td>36 value="" /> <font color='red'>Notice: Passwords are case sensitive. </font> </td> 37 37 </tr> 38 38 39 </tbody> 39 40 </table> … … 43 44 <input type="hidden" name="came_from" value="" 44 45 tal:condition="exists: request/came_from" 45 tal:attributes="value request/came_from" /> 46 tal:attributes="value request/came_from" /> 46 47 <!-- ****** Enable the automatic redirect ***** --> 47 48 <input i18n:attributes="value" class="standalone" 48 49 type="submit" name="submit" value="button_login" /> 50 51 49 52 </p> 50 53 … … 58 61 <p i18n:translate="help_login_troubles_cookies"> 59 62 Having trouble logging in? Make sure to enable cookies in 60 your web browser. 63 your web browser. 61 64 </p> 62 65 -
WAeUP_SRP/base/skins/waeup_student/course_registration_slip.pt
r2579 r2606 74 74 <br /> 75 75 <table class="contentListing" width="100%" summary="content layout" id="folder_content"> 76 <tr tal:repeat="row info/normal" 77 tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')"> 78 <td width="72%" tal:content="row/title"></td> 79 <td align="center" width="10%" tal:content="row/code"></td> 80 <td align="center" width="2%">S<span tal:content="row/semester" /></td> 81 <td align="center" width="2%" tal:content="row/credits"></td> 82 <td align="center" width="14%" tal:content="row/coe|nothing"></td> 83 </tr> 76 77 78 <span tal:repeat="sem python:('1','2')"> 79 80 <th colspan="3" tal:content="python: test(sem == '1','First Semester', 'Second Semester')" /> 81 <tr tal:repeat="row python: test(sem == '1',info['normal1'],info['normal2'])" 82 tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')"> 83 <td align="left" valign="middle" style="width: 5px;" 84 tal:condition="show_check_boxes"> 85 <input type="checkbox" name="ids:list" value="" id="" class="noborder" 86 tal:define="id row/id" 87 tal:attributes="value id; 88 id python:'cb_' + id; 89 checked python:id in info['choosen_ids'];" 90 /> 91 </td> 92 <td width="71%" tal:content="row/title"></td> 93 <td align="center" width="10%" tal:content="row/code"></td> 94 <td align="center" width="2%">S<span tal:content="row/semester" /></td> 95 <td align="center" width="2%" tal:content="row/credits"></td> 96 <td align="center" width="10%" tal:content="row/coe|nothing"></td> 97 98 <td tal:condition="python:review_state == 'school_fee_paid'" width="5%" align="center"> 99 <a href="edit" tal:attributes="href string:course_edit/${row/code}" 100 target="edit" 101 onclick="javascript:window.open('','edit','width=600, height=350, directories=no, toolbar=no, location=no, menubar=no, scrollbars=yes, status=no, resizable=no, dependent=no')"> 102 [edit] 103 </a> 104 </td> 105 </tr> 106 107 108 <th colspan="3" tal:condition="info/normal3"> Combined</th> 109 <tr tal:condition="info/normal3" tal:repeat="row info/normal3" 110 tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')"> 111 <td align="left" valign="middle" style="width: 5px;" 112 tal:condition="show_check_boxes"> 113 <input type="checkbox" name="ids:list" value="" id="" class="noborder" 114 tal:define="id row/id" 115 tal:attributes="value id; 116 id python:'cb_' + id; 117 checked python:id in info['choosen_ids'];" 118 /> 119 </td> 120 <td width="71%" tal:content="row/title"></td> 121 <td align="center" width="10%" tal:content="row/code"></td> 122 <td align="center" width="2%">S<span tal:content="row/semester" /></td> 123 <td align="center" width="2%" tal:content="row/credits"></td> 124 <td align="center" width="10%" tal:content="row/coe|nothing"></td> 125 126 <td tal:condition="python:review_state == 'school_fee_paid'" width="5%" align="center"> 127 <a href="edit" tal:attributes="href string:course_edit/${row/code}" 128 target="edit" 129 onclick="javascript:window.open('','edit','width=600, height=350, directories=no, toolbar=no, location=no, menubar=no, scrollbars=yes, status=no, resizable=no, dependent=no')"> 130 [edit] 131 </a> 132 </td> 133 </tr> 134 135 </span> 136 84 137 <tr> 85 138 <td width="82%" colspan="2" align="right">Total Credits:</td> -
WAeUP_SRP/base/skins/waeup_student/getStudyLevelInfo.py
r2486 r2606 55 55 # return 0.0 56 56 57 def cmp_semester_id(a,b):58 s1 = "%(semester)s%(id)s" % a59 s2 = "%(semester)s%(id)s" % b60 if s1 == s2:61 return 062 if s1 > s2:63 return 164 return -157 #def cmp_semester_id(a,b): 58 # s1 = "%(semester)s%(id)s" % a 59 # s2 = "%(semester)s%(id)s" % b 60 # if s1 == s2: 61 # return 0 62 # if s1 > s2: 63 # return 1 64 # return -1 65 65 66 66 student_id = context.getStudentId() … … 95 95 course_results.moveResultsHere(context,student_id) 96 96 logger.info("%s initiated moveResultsHere for %s in level %s" % (member_id,student_id,level_id)) 97 credits_total,carry_overs,normal = course_results.getCourses(student_id,level_id)97 credits_total,carry_overs,normal1,normal2,normal3 = course_results.getCourses(student_id,level_id) 98 98 info['credits_total'] = credits_total 99 99 max_credits = 50 … … 108 108 info['carry_overs'] = carry_overs 109 109 # normal.sort(cmp_semester_id) 110 info['normal'] = normal 110 info['normal1'] = normal1 111 info['normal2'] = normal2 112 info['normal3'] = normal3 111 113 112 114 students_object = context.portal_url.getPortalObject().campus.students -
WAeUP_SRP/base/skins/waeup_student/login_student.pt
r1022 r2606 42 42 <td> 43 43 <input type="password" id="password" name="__ac_password" size="20" 44 value="" /> </td>44 value="" /> <font color='red'>Notice: Passwords are case sensitive. </font> </td> 45 45 </tr> 46 46 </tbody> -
WAeUP_SRP/base/skins/waeup_student/student_view.pt
r2496 r2606 67 67 68 68 <span tal:repeat="row rows"> 69 <tr tal:condition="python:row['type'] != 'StudentPume'" 70 tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')"> 69 <tr tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')"> 71 70 <td><a href="view" tal:attributes="href string:${row/url}"> 72 71 <strong tal:content="row/title" /></a> </td> -
WAeUP_SRP/base/skins/waeup_student/study_level_view.pt
r2489 r2606 46 46 <tr tal:repeat="row info/carry_overs" 47 47 tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')"> 48 48 49 <td align="left" valign="middle" style="width: 5px;" 49 50 tal:condition="show_check_boxes"> … … 68 69 <h4>Session Courses</h4> 69 70 <br /> 70 <div class="" tal:condition=" not: info/normal">71 <div class="" tal:condition="python: not (info['normal1'] or info['normal2'] or info['normal3'])"> 71 72 <font color="red">Your faculty has not yet provided the list of courses for your certificate. Please contact your faculty!</font> 72 73 <br /><br /> 73 74 </div> 74 <table class="contentListing" width="100%" id="folder_content" 75 tal:condition="info/normal"> 76 <tr tal:repeat="row info/normal" 75 <table class="contentListing" width="100%" id="folder_content"> 76 77 <span tal:repeat="sem python:('1','2')"> 78 79 <th colspan="3" tal:content="python: test(sem == '1','First Semester', 'Second Semester')" /> 80 <tr tal:repeat="row python: test(sem == '1',info['normal1'],info['normal2'])" 77 81 tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')"> 78 82 <td align="left" valign="middle" style="width: 5px;" … … 91 95 <td align="center" width="10%" tal:content="row/coe|nothing"></td> 92 96 93 94 95 96 97 <td tal:condition="python:review_state == 'school_fee_paid'" width="5%" align="center"> 97 98 <a href="edit" tal:attributes="href string:course_edit/${row/code}" … … 101 102 </a> 102 103 </td> 104 </tr> 105 106 107 <th colspan="3" tal:condition="info/normal3"> Combined</th> 108 <tr tal:condition="info/normal3" tal:repeat="row info/normal3" 109 tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')"> 110 <td align="left" valign="middle" style="width: 5px;" 111 tal:condition="show_check_boxes"> 112 <input type="checkbox" name="ids:list" value="" id="" class="noborder" 113 tal:define="id row/id" 114 tal:attributes="value id; 115 id python:'cb_' + id; 116 checked python:id in info['choosen_ids'];" 117 /> 118 </td> 119 <td width="71%" tal:content="row/title"></td> 120 <td align="center" width="10%" tal:content="row/code"></td> 121 <td align="center" width="2%">S<span tal:content="row/semester" /></td> 122 <td align="center" width="2%" tal:content="row/credits"></td> 123 <td align="center" width="10%" tal:content="row/coe|nothing"></td> 103 124 104 105 </tr> 125 <td tal:condition="python:review_state == 'school_fee_paid'" width="5%" align="center"> 126 <a href="edit" tal:attributes="href string:course_edit/${row/code}" 127 target="edit" 128 onclick="javascript:window.open('','edit','width=600, height=350, directories=no, toolbar=no, location=no, menubar=no, scrollbars=yes, status=no, resizable=no, dependent=no')"> 129 [edit] 130 </a> 131 </td> 132 </tr> 133 134 135 136 </span> 137 106 138 <tr> 107 139 <td tal:condition="show_check_boxes" colspan="1"></td>
Note: See TracChangeset for help on using the changeset viewer.
