Changeset 3727


Ignore:
Timestamp:
15 Oct 2008, 05:04:28 (16 years ago)
Author:
Henrik Bettermann
Message:
  • more customizations for OIS
  • fetch all student object titles from getStudentObjectTitles.py
Location:
WAeUP_SRP/trunk
Files:
9 added
6 deleted
23 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/trunk/CHANGES.txt

    r3726 r3727  
    8787- enable reg_transition by import in edit mode
    8888- add graduate transition and graduated state to student workflow
     89
     901.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  
    154154
    155155  <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">
    156172    <property name="title">CA Score 1</property>
    157173    <property name="fields">

  • WAeUP_SRP/trunk/profiles/default/schemas/import_course_result.xml

    r3689 r3727  
    1010 <field name="credits" meta_type="CPS Int Field"/>
    1111 <field name="score" meta_type="CPS String Field"/>
     12 <field name="atl" meta_type="CPS Int Field"/>
    1213 <field name="ca1" meta_type="CPS Int Field"/>
    1314 <field name="ca2" meta_type="CPS Int Field"/>

  • WAeUP_SRP/trunk/profiles/default/schemas/student_course_result.xml

    r3689 r3727  
    1111 <field name="status" meta_type="CPS String Field"/>
    1212 <field name="passmark" meta_type="CPS Int Field"/>
     13 <field name="atl" meta_type="CPS String Field"/>
    1314 <field name="ca1" meta_type="CPS Int Field"/>
    1415 <field name="ca2" meta_type="CPS Int Field"/>

  • WAeUP_SRP/trunk/profiles/default/vocabularies/pastoral_grade.xml

    r3689 r3727  
    66    <property name="description"></property>
    77    <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>
    1312</object>

  • WAeUP_SRP/trunk/profiles/ois/actions.xml

    r3715 r3727  
    77   <permission>View</permission>
    88  </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"/>   
    920  <action title="My Accommodation" action_id="reserve_accommodation"
    1021     category="student_navigation" condition_expr="member"

  • WAeUP_SRP/trunk/profiles/ois/course_results.xml

    r3689 r3727  
    1111 <column value="session_id"/>
    1212 <column value="score"/>
     13 <column value="atl"/>
    1314 <column value="ca1"/>
    1415 <column value="ca2"/>

  • WAeUP_SRP/trunk/profiles/ois/layouts/student_clearance.xml

    r3689 r3727  
    620620 </widget>
    621621 <widget name="matric_no" meta_type="String Widget">
    622   <property name="title">Matriculation Number</property>
     622  <property name="title">Registration Number</property>
    623623  <property name="fields">
    624624   <element value="matric_no"/>
    625625  </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>
    628628  <property name="readonly_layout_modes">
    629629  </property>

  • WAeUP_SRP/trunk/profiles/ois/layouts/student_clearance_fe.xml

    r3689 r3727  
    587587 </widget>
    588588 <widget name="matric_no" meta_type="String Widget">
    589   <property name="title">Matriculation Number</property>
     589  <property name="title">Registration Number</property>
    590590  <property name="fields">
    591591   <element value="matric_no"/>
    592592  </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>
    595595  <property name="readonly_layout_modes">
    596596   <element value="edit"/>

  • WAeUP_SRP/trunk/profiles/ois/layouts/student_course_result.xml

    r3707 r3727  
    1010 <property name="label_edit"></property>
    1111 <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> 
    1225 <widget name="ca1" meta_type="Float Widget">
    1326  <property name="title">CA 1 Marks</property>
    … …  
    146159  </row>
    147160  <row>
     161   <cell name="atl"/>
     162  </row> 
     163  <row>
    148164   <cell name="ca1"/>
    149165  </row>

  • WAeUP_SRP/trunk/skins/waeup_layout/layout_search_session_edit.pt

    r2243 r3727  
    7878  <br /><br />
    7979  <input type="submit" class="standalone" name="cpsdocument_edit_button"
    80          value="Save & First-time Login"
     80         value="Save & Login"
    8181         id="cpsdocument_edit_button"
    8282         tal:condition="not:creation" />

  • WAeUP_SRP/trunk/skins/waeup_ois/academic_report_slip.pt

    r3718 r3727  
    2323                    <tr tal:condition="python:info[sem[2]]">
    2424                        <th tal:content="python:sem[1]" />
     25                        <th align='center'>ATL</th> 
    2526                        <th align='center'>CA 1 <br />Marks</th>
    2627                        <th align='center'>CA 2 <br />Marks</th>   
    … …  
    3435                        tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
    3536                        <td tal:content="row/title"></td>
     37                        <td align="center" tal:content="python:context.portal_vocabularies.pastoral_grade.get(row['atl'])"></td>
    3638                        <td align="center" tal:content="row/ca1"></td>
    3739                        <td align="center" tal:content="row/ca2"></td>

  • WAeUP_SRP/trunk/skins/waeup_ois/academic_report_view.pt

    r3718 r3727  
    4444        <span tal:content="info/student/name" />:
    4545      </span>
    46       <span tal:condition="is_student">My </span>
    47      
    4846      Subject Registration Form for <span tal:content="info/level_str" />
    4947    </h3>
    50    
    51         <br />
     48       
     49    <br />
    5250           
    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>           
    7361   
    7462             
    … …  
    8977        <th tal:attributes="colspan python: test(show_check_boxes,'2','1')"
    9078            tal:content="python:sem[1]" />
     79        <th align='center'>ATL</th>   
    9180        <th align='center'>CA 1 <br />Marks</th>
    9281        <th align='center'>CA 2 <br />Marks</th>   
    … …  
    11099          </td>
    111100          <td tal:content="row/title"></td>
     101          <td align="center" tal:content="python:context.portal_vocabularies.pastoral_grade.get(row['atl'])"></td>
    112102          <td align="center" tal:content="row/ca1"></td>
    113103          <td align="center" tal:content="row/ca2"></td>
    … …  
    275265      </table>
    276266      </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>     
    277280  </span>
    278281  </span>       

  • WAeUP_SRP/trunk/skins/waeup_ois/layout_application_view_info.pt

    r3707 r3727  
    2929        </tr>         
    3030        <tr valign="top">
    31           <td><span class="dlabel">Student ID</span>:
     31          <td><span class="dlabel">Online Student ID</span>:
    3232          </td>
    3333          <td>

  • WAeUP_SRP/trunk/skins/waeup_ois/student_view.pt

    r3707 r3727  
    3838            <td><span tal:content="python:context.portal_vocabularies.student_levels.get(baseinfo['level'])" /></td>
    3939          </tr>
    40           <tr>
     40          <tr tal:condition="is_staff">
    4141            <td>Current Study Mode:</td>
    4242            <td><span tal:content="python:context.portal_vocabularies.entry_modes.get(baseinfo['mode'])" /></td>
    4343          </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">
    4546            <td>Current Verdict:</td>
    4647            <td><span tal:condition="verdict" tal:content="python:verdict.upper()" /></td>

  • WAeUP_SRP/trunk/skins/waeup_ois/study_course_view.pt

    r3718 r3727  
    77    <span tal:condition="info">
    88    <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;">               
    1011    <a href=""
    1112       tal:attributes="href string:${here/academicsParent}">
    … …  
    1718         <span tal:content="info/student/name" />:
    1819       </span>
    19         Study Course
     20       <span tal:content="titles/StudentStudyCourse" />
    2021    </h3>
    2122    <br /> 
    … …  
    3334        <td><span tal:content="python:context.portal_vocabularies.student_levels.get(info['doc'].current_level)" /></td>
    3435      </tr>
    35       <tr>
     36      <tr tal:condition="is_so">
    3637        <td width="220px">Current Study Mode:</td>
    3738        <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  
    11<metal:body use-macro="here/slip_template/macros/master">
    22    <metal:main fill-slot="main"
    3                 tal:define="info context/getApplicationInfo">
     3                tal:define="info context/getApplicationInfo;
     4                            titles here/getStudentObjectTitles;">
    45      <span tal:condition="not: info">
    56        <span tal:content="here/illegal_view" />
    … …  
    78      <span tal:condition="info">
    89           
    9         <h3>Application Slip</h3>
     10        <h3><span tal:content="titles/StudentApplication" /> Slip</h3>
    1011        <br />
    1112        <span tal:omit-tag=""

  • WAeUP_SRP/trunk/skins/waeup_student/application_view.pt

    r2670 r3727  
    11<metal:body use-macro="here/main_template/macros/master">
    22   <metal:main fill-slot="main"
    3                  tal:define="info context/getApplicationInfo">
     3                 tal:define="info context/getApplicationInfo;
     4                             titles here/getStudentObjectTitles;">
    45      <span tal:condition="not: info">
    56        <span tal:content="here/illegal_view" />
    … …  
    1314          Up one level
    1415        </a>
    15         <h3>My Application Record</h3>
     16        <h3>My <span tal:content="titles/StudentApplication" /></h3>
    1617        <br />
    1718        <span tal:omit-tag=""

  • WAeUP_SRP/trunk/skins/waeup_student/clearance_slip.pt

    r3452 r3727  
    11<metal:body use-macro="here/slip_template/macros/master">
    22    <metal:main fill-slot="main"
    3                  tal:define="info context/getClearanceInfo">
     3                 tal:define="info context/getClearanceInfo;
     4                             titles here/getStudentObjectTitles;">
    45      <span tal:condition="not: info">
    56        <span tal:content="here/illegal_view" />
    … …  
    910      <strong>Late Clearance!</strong></div>
    1011           
    11         <h3>Clearance/Eligibility Slip</h3>
     12        <h3><span tal:content="titles/StudentClearance" /> Slip</h3>
    1213        <br />
    1314        <span tal:omit-tag=""

  • WAeUP_SRP/trunk/skins/waeup_student/clearance_view.pt

    r3473 r3727  
    11<metal:body use-macro="here/main_template/macros/master">
    22  <metal:main fill-slot="main"
    3               tal:define="info context/getClearanceInfo">
     3              tal:define="info context/getClearanceInfo;
     4                          titles here/getStudentObjectTitles;">
    45    <span tal:condition="not: info">
    56      <span tal:content="here/illegal_view" />
    … …  
    1213           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')">
    1314          <img tal:attributes="src string:${here/portal_url}/actionicon_print.png" />
    14           Clearance/Eligibility Slip
     15          <span tal:content="titles/StudentClearance" /> Slip
    1516        </a>
    1617      </div>
    … …  
    2930          My
    3031        </span>
    31         Clearance/Elegibility Record
     32        <span tal:content="titles/StudentClearance" />
    3233      </h3>       
    3334     

  • WAeUP_SRP/trunk/skins/waeup_student/lecturer_course_edit_form.pt

    r3617 r3727  
    2121                 value="Save"
    2222                 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" />                   
    2328        </form>
    2429      </metal:block>

  • WAeUP_SRP/trunk/skins/waeup_student/personal_view.pt

    r1783 r3727  
    11<metal:body use-macro="here/main_template/macros/master">
    22    <metal:main fill-slot="main"
    3                 tal:define="info context/getPersonalInfo">
     3                tal:define="info context/getPersonalInfo;
     4                            titles here/getStudentObjectTitles;">
    45      <span tal:condition="not: info">
    56        <span tal:content="here/illegal_view" />
    … …  
    1112          Up one level
    1213        </a>           
    13         <h3>My Personal Record</h3>
     14        <h3>My <span tal:content="titles/StudentPersonal" /></h3>
    1415        <br />
    1516        <span tal:omit-tag=""

  • WAeUP_SRP/trunk/skins/waeup_student/study_course_view.pt

    r3473 r3727  
    77    <span tal:condition="info">
    88    <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;">               
    1011    <a href=""
    1112       tal:attributes="href string:${here/academicsParent}">
    … …  
    1718         <span tal:content="info/student/name" />:
    1819       </span>
    19         Study Course
     20       My <span tal:content="titles/StudentStudyCourse" />
    2021    </h3>
    2122    <br /> 
Note: See TracChangeset for help on using the changeset viewer.