Changeset 2489
- Timestamp:
- 31 Oct 2007, 11:15:56 (17 years ago)
- Location:
- WAeUP_SRP/base/skins
- Files:
-
- 5 edited
-
cps_custom/logged_in.py (modified) (1 diff)
-
waeup_student/course_registration_slip.pt (modified) (2 diffs)
-
waeup_student/create_level.py (modified) (1 diff)
-
waeup_student/external_study_level_view.pt (modified) (4 diffs)
-
waeup_student/study_level_view.pt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
WAeUP_SRP/base/skins/cps_custom/logged_in.py
r2485 r2489 231 231 lnr = context.getLevelFromResultsCosCode(has_results) 232 232 dsc['current_level'] = "%d00" % lnr 233 elif not has_level and s_review_state == 'school_fee_paid': 233 elif not has_level and s_review_state == 'school_fee_paid': 234 234 lnr = context.getLevelFromResultsCosCode(has_results) 235 if dsc['current_verdict'] in ('A','B',): 235 cv = context.getVerdict(has_results[0].Verdict)[0] 236 if cv in ('A','B',): 236 237 lnr += 1 237 238 dsc['current_level'] = "%d00" % lnr 239 dsc['previous_verdict'] = cv 238 240 if sc_review_state != 'opened': 239 241 wftool.doActionFor(study_course,'open') -
WAeUP_SRP/base/skins/waeup_student/course_registration_slip.pt
r2031 r2489 60 60 <h4>Carryover Courses</h4> 61 61 <br /> 62 <table tal:condition="python: 1"class="contentListing" width="100%" summary="content layout" id="folder_content">62 <table class="contentListing" width="100%" summary="content layout" id="folder_content"> 63 63 <tr tal:repeat="row info/carry_overs" 64 64 tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')"> 65 <td width="7 8%" tal:content="row/title"></td>66 <td width="10%" tal:content="row/code"></td>67 <td width="2%">S<span tal:content="row/semester" /></td>68 <td width="2%" tal:content="row/credits"></td>69 <td width="8%" tal:content="row/grade|string:"></td>65 <td width="72%" tal:content="row/title"></td> 66 <td align="center" width="10%" tal:content="row/code"></td> 67 <td align="center" width="2%">S<span tal:content="row/semester" /></td> 68 <td align="center" width="2%" tal:content="row/credits"></td> 69 <td align="center" width="14%"> <span tal:content="row/coe|nothing" /></td> 70 70 </tr> 71 71 </table> … … 76 76 <tr tal:repeat="row info/normal" 77 77 tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')"> 78 <td width="7 8%" tal:content="row/title"></td>79 <td width="10%" tal:content="row/code"></td>80 <td width="2%">S<span tal:content="row/semester" /></td>81 <td width="2%" tal:content="row/credits"></td>82 <td width="8%" tal:content="row/coe|nothing"></td>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 83 </tr> 84 84 <tr> 85 <t h colspan="2" align="right">Total Credits:</th>86 <td ></td>85 <td width="82%" colspan="2" align="right">Total Credits:</td> 86 <td width="2%"> </td> 87 87 <td width="2%" tal:content="info/credits_total"></td> 88 <td width="14%"> </td> 88 89 </tr> 89 90 </table> -
WAeUP_SRP/base/skins/waeup_student/create_level.py
r2472 r2489 108 108 d = context.getCourseInfo(co.CosCode) 109 109 d['course_id'] = course_id 110 d['grade'] = co.GRADE110 #d['grade'] = co.GRADE 111 111 d['carry_over'] = carry_over 112 112 # course_id = level.invokeFactory('StudentCourseResult',"%s_co" % course_id) -
WAeUP_SRP/base/skins/waeup_student/external_study_level_view.pt
r1980 r2489 36 36 <h4>Carryover Courses</h4> 37 37 <br /> 38 <table tal:condition="python: 1" class="contentListing" width="100%" summary="content layout" id="folder_content">38 <table class="contentListing" width="100%" summary="content layout" id="folder_content" tal:condition="info/carry_overs"> 39 39 <tr tal:repeat="row info/carry_overs" 40 40 tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')"> 41 <td align="left" valign="middle" style="width: 5px;"42 41 42 <td align="left" valign="middle" width="5%" tal:condition="show_check_boxes"> 43 43 <input type="checkbox" name="ids:list" value="" id="" class="noborder" 44 44 tal:define="id row/id" … … 48 48 /> 49 49 </td> 50 <td width="7 8%" tal:content="row/title"></td>51 <td width="10%" tal:content="row/code"></td>52 <td width="2%">S<span tal:content="row/semester" /></td>53 <td width="2%" tal:content="row/credits"></td>54 <td width="8%" tal:content="row/grade|string:"></td>50 <td width="72%" tal:content="row/title"></td> 51 <td align="center" width="10%" tal:content="row/code"></td> 52 <td align="center" width="2%">S<span tal:content="row/semester" /></td> 53 <td align="center" width="2%" tal:content="row/credits"></td> 54 <td align="center" width="9%" tal:content="row/coe|nothing"></td> 55 55 </tr> 56 56 </table> 57 57 </span> 58 58 <br /> 59 59 60 <h4>Session Courses</h4> 60 61 <br /> 61 <div class="" tal:condition="not: info/normal">62 Your faculty has not yet provided the list of courses for your certificate. Please contact your faculty!63 </div>64 <table class="contentListing" width="100%" id="folder_content"65 62 <div class="" tal:condition="not: info/normal"> 63 Your faculty has not yet provided the list of courses for your certificate. Please contact your faculty! 64 </div> 65 66 <table class="contentListing" width="100%" id="folder_content" tal:condition="info/normal"> 66 67 <tr tal:repeat="row info/normal" 67 68 tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')"> 68 <td align="left" valign="middle" style="width: 5px;"69 69 70 <td align="left" valign="middle" width="5%" tal:condition="show_check_boxes"> 70 71 <input type="checkbox" name="ids:list" value="" id="" class="noborder" 71 72 tal:define="id row/id" … … 75 76 /> 76 77 </td> 77 <td width="78%" tal:content="row/title"></td> 78 <td width="10%" tal:content="row/code"></td> 79 <td width="2%">S<span tal:content="row/semester" /></td> 80 <td width="2%" tal:content="row/credits"></td> 81 <td width="8%" tal:content="row/coe|nothing"></td> 82 </tr> 83 <tr> 84 <td tal:condition="show_check_boxes" colspan="1"></td> 85 <td colspan="1"></td> 86 <th colspan="2">Total Credits:</th> 87 <td align="center" width="2%" tal:content="info/credits_total"></td> 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="9%" tal:content="row/coe|nothing"></td> 83 </tr> 84 <tr> 85 <td width="5%" tal:condition="show_check_boxes"> </td> 86 <td width="82%" colspan="2" align="right">Total Credits:</td> 87 <td width="2%"> </td> 88 <td width="2%" align="center" tal:content="info/credits_total"></td> 89 <td width="9%"> </td> 88 90 </tr> 89 91 </table> … … 138 140 <input tal:condition="python: review_state in ('courses_registered', 'courses_validated',)" type="submit" name="reject_courses:method" 139 141 class="context" value="Reject" /> 142 <input type="hidden" name="action_after_validate" type="text" id="action_after_validate" 143 tal:attributes="value string:external_study_level_view"/> 144 <input type="hidden" name="action_after_reject" type="text" id="action_after_reject" 145 tal:attributes="value string:external_contact_student_form"/> 140 146 141 147 </td> -
WAeUP_SRP/base/skins/waeup_student/study_level_view.pt
r2448 r2489 55 55 /> 56 56 </td> 57 <td width=" 66%" tal:content="row/title"></td>57 <td width="71%" tal:content="row/title"></td> 58 58 <td align="center" width="10%" tal:content="row/code"></td> 59 59 <td align="center" width="2%">S<span tal:content="row/semester" /></td> … … 85 85 /> 86 86 </td> 87 <td width=" 66%" tal:content="row/title"></td>87 <td width="71%" tal:content="row/title"></td> 88 88 <td align="center" width="10%" tal:content="row/code"></td> 89 89 <td align="center" width="2%">S<span tal:content="row/semester" /></td>
Note: See TracChangeset for help on using the changeset viewer.
