Changeset 3727 for WAeUP_SRP/trunk
- Timestamp:
- 15 Oct 2008, 05:04:28 (16 years ago)
- Location:
- WAeUP_SRP/trunk
- Files:
-
- 9 added
- 6 deleted
- 23 edited
Legend:
- Unmodified
- Added
- Removed
-
WAeUP_SRP/trunk/CHANGES.txt
r3726 r3727 87 87 - enable reg_transition by import in edit mode 88 88 - add graduate transition and graduated state to student workflow 89 90 1.16 (2008-10-15) 91 ----------------- 92 - more customizations for OIS 93 - fetch all student object titles from getStudentObjectTitles.py -
WAeUP_SRP/trunk/profiles/default/layouts/import_course_result.xml
r3689 r3727 154 154 155 155 <widget name="ca1" meta_type="Int Widget"> 156 <property name="title">ATL</property> 157 <property name="fields"> 158 <element value="atl"/> 159 </property> 160 <property name="is_required">False</property> 161 <property name="label">ATL</property> 162 <property name="label_edit">ATL</property> 163 <property name="readonly_layout_modes"> 164 </property> 165 <property name="hidden_layout_modes"/> 166 <property name="hidden_readonly_layout_modes"/> 167 <property name="min_value">1</property> 168 <property name="max_value">4</property> 169 </widget> 170 171 <widget name="ca1" meta_type="Int Widget"> 156 172 <property name="title">CA Score 1</property> 157 173 <property name="fields"> -
WAeUP_SRP/trunk/profiles/default/schemas/import_course_result.xml
r3689 r3727 10 10 <field name="credits" meta_type="CPS Int Field"/> 11 11 <field name="score" meta_type="CPS String Field"/> 12 <field name="atl" meta_type="CPS Int Field"/> 12 13 <field name="ca1" meta_type="CPS Int Field"/> 13 14 <field name="ca2" meta_type="CPS Int Field"/> -
WAeUP_SRP/trunk/profiles/default/schemas/student_course_result.xml
r3689 r3727 11 11 <field name="status" meta_type="CPS String Field"/> 12 12 <field name="passmark" meta_type="CPS Int Field"/> 13 <field name="atl" meta_type="CPS String Field"/> 13 14 <field name="ca1" meta_type="CPS Int Field"/> 14 15 <field name="ca2" meta_type="CPS Int Field"/> -
WAeUP_SRP/trunk/profiles/default/vocabularies/pastoral_grade.xml
r3689 r3727 6 6 <property name="description"></property> 7 7 <item key="" msgid=""></item> 8 <item key="outstanding" msgid="">Outstanding</item> 9 <item key="very_good" msgid="">Very Good</item> 10 <item key="good" msgid="">Good</item> 11 <item key="satisfactory" msgid="">Satisfactory</item> 12 <item key="unsatisfactory" msgid="">Unsatisfactory</item> 8 <item key="1" msgid="">Excellent</item> 9 <item key="2" msgid="">Showing Promise</item> 10 <item key="3" msgid="">Some Concern</item> 11 <item key="4" msgid="">Major Concern</item> 13 12 </object> -
WAeUP_SRP/trunk/profiles/ois/actions.xml
r3715 r3727 7 7 <permission>View</permission> 8 8 </action> 9 </action-provider> 10 <action-provider name="portal_actions"> 11 <action title="Study" action_id="registration" 12 category="student_navigation" condition_expr="member" 13 url_expr="string:${portal_url}/campus/students" visible="True"> 14 <permission>View</permission> 15 </action> 16 <action title="Payments" action_id="payments" 17 category="student_navigation" condition_expr="member" 18 url_expr="string:${portal_url}/campus/students/${member}/payments" 19 visible="True"/> 9 20 <action title="My Accommodation" action_id="reserve_accommodation" 10 21 category="student_navigation" condition_expr="member" -
WAeUP_SRP/trunk/profiles/ois/course_results.xml
r3689 r3727 11 11 <column value="session_id"/> 12 12 <column value="score"/> 13 <column value="atl"/> 13 14 <column value="ca1"/> 14 15 <column value="ca2"/> -
WAeUP_SRP/trunk/profiles/ois/layouts/student_clearance.xml
r3689 r3727 620 620 </widget> 621 621 <widget name="matric_no" meta_type="String Widget"> 622 <property name="title"> Matriculation Number</property>622 <property name="title">Registration Number</property> 623 623 <property name="fields"> 624 624 <element value="matric_no"/> 625 625 </property> 626 <property name="label"> Matriculation Number</property>627 <property name="label_edit"> Matriculation Number</property>626 <property name="label">Registration Number</property> 627 <property name="label_edit">Registration Number</property> 628 628 <property name="readonly_layout_modes"> 629 629 </property> -
WAeUP_SRP/trunk/profiles/ois/layouts/student_clearance_fe.xml
r3689 r3727 587 587 </widget> 588 588 <widget name="matric_no" meta_type="String Widget"> 589 <property name="title"> Matriculation Number</property>589 <property name="title">Registration Number</property> 590 590 <property name="fields"> 591 591 <element value="matric_no"/> 592 592 </property> 593 <property name="label"> Matriculation Number</property>594 <property name="label_edit"> Matriculation Number</property>593 <property name="label">Registration Number</property> 594 <property name="label_edit">Registration Number</property> 595 595 <property name="readonly_layout_modes"> 596 596 <element value="edit"/> -
WAeUP_SRP/trunk/profiles/ois/layouts/student_course_result.xml
r3707 r3727 10 10 <property name="label_edit"></property> 11 11 <property name="is_i18n">False</property> 12 <widget name="atl" meta_type="Select Widget"> 13 <property name="title">ATL</property> 14 <property name="fields"> 15 <element value="atl"/> 16 </property> 17 <property name="label">ATL</property> 18 <property name="label_edit">ATL</property> 19 <property name="readonly_layout_modes"> 20 </property> 21 <property name="hidden_layout_modes"/> 22 <property name="hidden_readonly_layout_modes"/> 23 <property name="vocabulary">pastoral_grade</property> 24 </widget> 12 25 <widget name="ca1" meta_type="Float Widget"> 13 26 <property name="title">CA 1 Marks</property> … … 146 159 </row> 147 160 <row> 161 <cell name="atl"/> 162 </row> 163 <row> 148 164 <cell name="ca1"/> 149 165 </row> -
WAeUP_SRP/trunk/skins/waeup_layout/layout_search_session_edit.pt
r2243 r3727 78 78 <br /><br /> 79 79 <input type="submit" class="standalone" name="cpsdocument_edit_button" 80 value="Save & First-timeLogin"80 value="Save & Login" 81 81 id="cpsdocument_edit_button" 82 82 tal:condition="not:creation" /> -
WAeUP_SRP/trunk/skins/waeup_ois/academic_report_slip.pt
r3718 r3727 23 23 <tr tal:condition="python:info[sem[2]]"> 24 24 <th tal:content="python:sem[1]" /> 25 <th align='center'>ATL</th> 25 26 <th align='center'>CA 1 <br />Marks</th> 26 27 <th align='center'>CA 2 <br />Marks</th> … … 34 35 tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')"> 35 36 <td tal:content="row/title"></td> 37 <td align="center" tal:content="python:context.portal_vocabularies.pastoral_grade.get(row['atl'])"></td> 36 38 <td align="center" tal:content="row/ca1"></td> 37 39 <td align="center" tal:content="row/ca2"></td> -
WAeUP_SRP/trunk/skins/waeup_ois/academic_report_view.pt
r3718 r3727 44 44 <span tal:content="info/student/name" />: 45 45 </span> 46 <span tal:condition="is_student">My </span>47 48 46 Subject Registration Form for <span tal:content="info/level_str" /> 49 47 </h3> 50 51 48 49 <br /> 52 50 53 <table> 54 <tr> 55 <th valign='top'>Pastoral Reports:</th> 56 <td> 57 <span tal:repeat="item python:info['items']"> 58 <a href="view" 59 tal:attributes="href item/id" 60 tal:content="item/title"/><br /> 61 </span> 62 </td> 63 </tr> 64 <tr> 65 <th>Session:</th> 66 <td><span tal:content="info/session" /></td> 67 </tr> 68 <tr tal:condition="has_verdict"> 69 <th>Verdict:</th> 70 <td><span tal:content="info/verdict" /></td> 71 </tr> 72 </table> 51 <table> 52 <tr> 53 <th>Session:</th> 54 <td><span tal:content="info/session" /></td> 55 </tr> 56 <tr tal:condition="has_verdict"> 57 <th>Verdict:</th> 58 <td><span tal:content="info/verdict" /></td> 59 </tr> 60 </table> 73 61 74 62 … … 89 77 <th tal:attributes="colspan python: test(show_check_boxes,'2','1')" 90 78 tal:content="python:sem[1]" /> 79 <th align='center'>ATL</th> 91 80 <th align='center'>CA 1 <br />Marks</th> 92 81 <th align='center'>CA 2 <br />Marks</th> … … 110 99 </td> 111 100 <td tal:content="row/title"></td> 101 <td align="center" tal:content="python:context.portal_vocabularies.pastoral_grade.get(row['atl'])"></td> 112 102 <td align="center" tal:content="row/ca1"></td> 113 103 <td align="center" tal:content="row/ca2"></td> … … 275 265 </table> 276 266 </form> 267 268 <table> 269 <tr> 270 <th valign='top'>Pastoral Reports:</th> 271 <td> 272 <span tal:repeat="item python:info['items']"> 273 <a href="view" 274 tal:attributes="href item/id" 275 tal:content="item/title"/><br /> 276 </span> 277 </td> 278 </tr> 279 </table> 277 280 </span> 278 281 </span> -
WAeUP_SRP/trunk/skins/waeup_ois/layout_application_view_info.pt
r3707 r3727 29 29 </tr> 30 30 <tr valign="top"> 31 <td><span class="dlabel"> Student ID</span>:31 <td><span class="dlabel">Online Student ID</span>: 32 32 </td> 33 33 <td> -
WAeUP_SRP/trunk/skins/waeup_ois/student_view.pt
r3707 r3727 38 38 <td><span tal:content="python:context.portal_vocabularies.student_levels.get(baseinfo['level'])" /></td> 39 39 </tr> 40 <tr >40 <tr tal:condition="is_staff"> 41 41 <td>Current Study Mode:</td> 42 42 <td><span tal:content="python:context.portal_vocabularies.entry_modes.get(baseinfo['mode'])" /></td> 43 43 </tr> 44 <tr tal:define="verdict python:context.portal_vocabularies.verdicts.get(baseinfo['verdict'])"> 44 <tr tal:define="verdict python:context.portal_vocabularies.verdicts.get(baseinfo['verdict'])" 45 tal:condition="is_staff"> 45 46 <td>Current Verdict:</td> 46 47 <td><span tal:condition="verdict" tal:content="python:verdict.upper()" /></td> -
WAeUP_SRP/trunk/skins/waeup_ois/study_course_view.pt
r3718 r3727 7 7 <span tal:condition="info"> 8 8 <span tal:define="create_level info/create_level|nothing; 9 is_so info/is_so;"> 9 is_so info/is_so; 10 titles here/getStudentObjectTitles;"> 10 11 <a href="" 11 12 tal:attributes="href string:${here/academicsParent}"> … … 17 18 <span tal:content="info/student/name" />: 18 19 </span> 19 Study Course20 <span tal:content="titles/StudentStudyCourse" /> 20 21 </h3> 21 22 <br /> … … 33 34 <td><span tal:content="python:context.portal_vocabularies.student_levels.get(info['doc'].current_level)" /></td> 34 35 </tr> 35 <tr >36 <tr tal:condition="is_so"> 36 37 <td width="220px">Current Study Mode:</td> 37 38 <td><span tal:content="python:context.portal_vocabularies.entry_modes.get(info['doc'].current_mode)" /></td> -
WAeUP_SRP/trunk/skins/waeup_student/application_slip.pt
r2575 r3727 1 1 <metal:body use-macro="here/slip_template/macros/master"> 2 2 <metal:main fill-slot="main" 3 tal:define="info context/getApplicationInfo"> 3 tal:define="info context/getApplicationInfo; 4 titles here/getStudentObjectTitles;"> 4 5 <span tal:condition="not: info"> 5 6 <span tal:content="here/illegal_view" /> … … 7 8 <span tal:condition="info"> 8 9 9 <h3> ApplicationSlip</h3>10 <h3><span tal:content="titles/StudentApplication" /> Slip</h3> 10 11 <br /> 11 12 <span tal:omit-tag="" -
WAeUP_SRP/trunk/skins/waeup_student/application_view.pt
r2670 r3727 1 1 <metal:body use-macro="here/main_template/macros/master"> 2 2 <metal:main fill-slot="main" 3 tal:define="info context/getApplicationInfo"> 3 tal:define="info context/getApplicationInfo; 4 titles here/getStudentObjectTitles;"> 4 5 <span tal:condition="not: info"> 5 6 <span tal:content="here/illegal_view" /> … … 13 14 Up one level 14 15 </a> 15 <h3>My Application Record</h3>16 <h3>My <span tal:content="titles/StudentApplication" /></h3> 16 17 <br /> 17 18 <span tal:omit-tag="" -
WAeUP_SRP/trunk/skins/waeup_student/clearance_slip.pt
r3452 r3727 1 1 <metal:body use-macro="here/slip_template/macros/master"> 2 2 <metal:main fill-slot="main" 3 tal:define="info context/getClearanceInfo"> 3 tal:define="info context/getClearanceInfo; 4 titles here/getStudentObjectTitles;"> 4 5 <span tal:condition="not: info"> 5 6 <span tal:content="here/illegal_view" /> … … 9 10 <strong>Late Clearance!</strong></div> 10 11 11 <h3> Clearance/EligibilitySlip</h3>12 <h3><span tal:content="titles/StudentClearance" /> Slip</h3> 12 13 <br /> 13 14 <span tal:omit-tag="" -
WAeUP_SRP/trunk/skins/waeup_student/clearance_view.pt
r3473 r3727 1 1 <metal:body use-macro="here/main_template/macros/master"> 2 2 <metal:main fill-slot="main" 3 tal:define="info context/getClearanceInfo"> 3 tal:define="info context/getClearanceInfo; 4 titles here/getStudentObjectTitles;"> 4 5 <span tal:condition="not: info"> 5 6 <span tal:content="here/illegal_view" /> … … 12 13 onclick="javascript:window.open('','slip','width=600, height=700, directories=no, toolbar=no, location=no, menubar=yes, scrollbars=yes, status=no, resizable=no, dependent=no')"> 13 14 <img tal:attributes="src string:${here/portal_url}/actionicon_print.png" /> 14 Clearance/EligibilitySlip15 <span tal:content="titles/StudentClearance" /> Slip 15 16 </a> 16 17 </div> … … 29 30 My 30 31 </span> 31 Clearance/Elegibility Record32 <span tal:content="titles/StudentClearance" /> 32 33 </h3> 33 34 -
WAeUP_SRP/trunk/skins/waeup_student/lecturer_course_edit_form.pt
r3617 r3727 21 21 value="Save" 22 22 id="edit"/> 23 <input type="submit" name="external_close_button" 24 class="standalone" value="Close" 25 onclick="window.opener.location.reload();window.close()" 26 id="external_close_button" 27 i18n:attributes="value" /> 23 28 </form> 24 29 </metal:block> -
WAeUP_SRP/trunk/skins/waeup_student/personal_view.pt
r1783 r3727 1 1 <metal:body use-macro="here/main_template/macros/master"> 2 2 <metal:main fill-slot="main" 3 tal:define="info context/getPersonalInfo"> 3 tal:define="info context/getPersonalInfo; 4 titles here/getStudentObjectTitles;"> 4 5 <span tal:condition="not: info"> 5 6 <span tal:content="here/illegal_view" /> … … 11 12 Up one level 12 13 </a> 13 <h3>My Personal Record</h3>14 <h3>My <span tal:content="titles/StudentPersonal" /></h3> 14 15 <br /> 15 16 <span tal:omit-tag="" -
WAeUP_SRP/trunk/skins/waeup_student/study_course_view.pt
r3473 r3727 7 7 <span tal:condition="info"> 8 8 <span tal:define="create_level info/create_level|nothing; 9 is_so info/is_so;"> 9 is_so info/is_so; 10 titles here/getStudentObjectTitles;"> 10 11 <a href="" 11 12 tal:attributes="href string:${here/academicsParent}"> … … 17 18 <span tal:content="info/student/name" />: 18 19 </span> 19 Study Course20 My <span tal:content="titles/StudentStudyCourse" /> 20 21 </h3> 21 22 <br />
Note: See TracChangeset for help on using the changeset viewer.