Changeset 1861


Ignore:
Timestamp:
7 Jun 2007, 20:33:13 (18 years ago)
Author:
Henrik Bettermann
Message:

ticket #200
ticket #243

Location:
WAeUP_SRP/trunk
Files:
4 added
9 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/trunk/profiles/default/layouts.xml

    r1782 r1861  
    2929  <object name="student_clearance_fe" meta_type="CPS Layout"/>
    3030  <object name="student_course_result" meta_type="CPS Layout"/>
     31  <object name="student_course_result_fe" meta_type="CPS Layout"/> 
    3132  <object name="student_create" meta_type="CPS Layout"/>
    3233  <object name="student_firsttime_login" meta_type="CPS Layout"/>

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

    r1856 r1861  
    11<?xml version="1.0"?>
    2 <?xml-stylesheet type="text/xsl" href="layout.xsl"?>
    32<object name="student_course_result" meta_type="CPS Layout">
    43 <property name="layout_create_method"></property>
    … …  
    87 <property name="flexible_widgets"/>
    98 <property name="validate_values_expr"></property>
    10  <widget name="ansbook" meta_type="String Widget">
    11   <property name="title">Ansbook</property>
    12   <property name="fields">
    13    <element value="ansbook"/>
    14   </property>
    15   <property name="label">Ansbook</property>
    16   <property name="label_edit">Ansbook</property>
    17   <property name="readonly_layout_modes"/>
    18   <property name="hidden_layout_modes"/>
    19   <property name="hidden_readonly_layout_modes"/>
    20  </widget>
    21  <widget name="carry_level" meta_type="String Widget">
    22   <property name="title">Carry Level</property>
    23   <property name="fields">
    24    <element value="carry_level"/>
    25   </property>
    26   <property name="label">Carry Level</property>
    27   <property name="label_edit">Carry Level</property>
    28   <property name="readonly_layout_modes"/>
    29   <property name="hidden_layout_modes"/>
    30   <property name="hidden_readonly_layout_modes"/>
    31  </widget>
     9
    3210 <widget name="code" meta_type="CertificateCourseId Widget">
    3311  <property name="title">Course Code</property>
    … …  
    4624 </widget>
    4725 <widget name="core_or_elective " meta_type="Boolean Widget">
    48   <property name="title">Core or Elective</property>
     26  <property name="title">Core or Elective (editable value)</property>
    4927  <property name="fields">
    5028   <element value="core_or_elective"/>
    5129  </property>
    5230  <property name="is_required">True</property>
    53   <property name="label">Core or Elective</property>
    54   <property name="label_edit">Core or Elective</property>
     31  <property name="label">Core or Elective (editable value)</property>
     32  <property name="label_edit">Core or Elective (editable value)</property>
    5533  <property name="readonly_layout_modes"/>
    5634  <property name="hidden_layout_modes"/>
    … …  
    6038 </widget>
    6139 <widget name="credits" meta_type="Int Widget">
    62   <property name="title">Credits</property>
     40  <property name="title">Credits (original value)</property>
    6341  <property name="fields">
    6442   <element value="credits"/>
    6543  </property>
    66   <property name="label">Credits</property>
    67   <property name="label_edit">Credits</property>
    68   <property name="readonly_layout_modes">
    69    <element value="edit"/>
    70    <element value="create"/>
    71   </property>
    72   <property name="hidden_layout_modes">
    73    <element value="create"/>
    74   </property>
    75   <property name="hidden_readonly_layout_modes"/>
    76  </widget>
    77  <widget name="grade" meta_type="String Widget">
    78   <property name="title">Grade</property>
    79   <property name="fields">
    80    <element value="grade"/>
    81   </property>
    82   <property name="label">Grade</property>
    83   <property name="label_edit">Grade</property>
    84   <property name="readonly_layout_modes"/>
    85   <property name="hidden_layout_modes"/>
    86   <property name="hidden_readonly_layout_modes"/>
    87  </widget>
    88  <widget name="import_id" meta_type="String Widget">
    89   <property name="title">ID imported</property>
    90   <property name="fields">
    91    <element value="import_id"/>
    92   </property>
    93   <property name="label">ID imported</property>
    94   <property name="label_edit">ID imported</property>
     44  <property name="label">Credits (original value)</property>
     45  <property name="label_edit">Credits (original value)</property>
    9546  <property name="readonly_layout_modes">
    9647   <element value="edit"/>
    … …  
    10354 </widget>
    10455 <widget name="passmark" meta_type="Int Widget">
    105   <property name="title">Passmark</property>
     56  <property name="title">Passmark (original value)</property>
    10657  <property name="fields">
    10758   <element value="passmark"/>
    10859  </property>
    109   <property name="label">Passmark</property>
    110   <property name="label_edit">Passmark</property>
     60  <property name="label">Passmark (original value)</property>
     61  <property name="label_edit">Passmark (original value)</property>
    11162  <property name="readonly_layout_modes">
    11263   <element value="edit"/>
    … …  
    12576  <property name="label">Score</property>
    12677  <property name="label_edit">Score</property>
    127   <property name="readonly_layout_modes"/>
     78  <property name="readonly_layout_modes">
     79  </property>
    12880  <property name="hidden_layout_modes"/>
    12981  <property name="hidden_readonly_layout_modes"/>
    13082 </widget>
    13183 <widget name="semester" meta_type="Int Widget">
    132   <property name="title">Semester</property>
     84  <property name="title">Semester </property>
    13385  <property name="fields">
    13486   <element value="semester"/>
    13587  </property>
    136   <property name="label">Semester</property>
    137   <property name="label_edit">Semester</property>
    138   <property name="readonly_layout_modes"/>
    139   <property name="hidden_layout_modes"/>
    140   <property name="hidden_readonly_layout_modes"/>
    141  </widget>
    142  <widget name="status" meta_type="String Widget">
    143   <property name="title">Status</property>
    144   <property name="fields">
    145    <element value="status"/>
    146   </property>
    147   <property name="label">Status</property>
    148   <property name="label_edit">Status</property>
     88  <property name="label">Semester (original value)</property>
     89  <property name="label_edit">Semester (original value)</property>
    14990  <property name="readonly_layout_modes">
    15091   <element value="edit"/>
    … …  
    15596 </widget>
    15697 <widget name="title" meta_type="String Widget">
    157   <property name="title">Course Title</property>
     98  <property name="title">Original Course Title</property>
    15899  <property name="fields">
    159100   <element value="title"/>
    160101  </property>
    161   <property name="label">Course Title</property>
    162   <property name="label_edit">Course Title</property>
     102  <property name="label">Original Course Title</property>
     103  <property name="label_edit">Original Course Title</property>
    163104  <property name="readonly_layout_modes">
    164105   <element value="edit"/>
    … …  
    170111  <property name="hidden_readonly_layout_modes"/>
    171112  <property name="display_width">60</property>
    172  </widget>
    173  <widget name="weight" meta_type="String Widget">
    174   <property name="title">Weight</property>
    175   <property name="fields">
    176    <element value="weight"/>
    177   </property>
    178   <property name="label">Weight</property>
    179   <property name="label_edit">Weight</property>
    180   <property name="readonly_layout_modes"/>
    181   <property name="hidden_layout_modes"/>
    182   <property name="hidden_readonly_layout_modes"/>
    183113 </widget>
    184114 <table>
    … …  
    199129  </row>
    200130  <row>
    201    <cell name="grade"/>
    202   </row>
    203   <row>
    204    <cell name="ansbook"/>
    205   </row>
    206   <row>
    207    <cell name="status"/>
    208   </row>
    209   <row>
    210131   <cell name="score"/>
    211   </row>
    212   <row>
    213    <cell name="weight"/>
    214132  </row>
    215133  <row>

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

    r1700 r1861  
    1212 <field name="semester" meta_type="CPS Int Field">
    1313  <property name="default_expr">python:1</property>
    14  </field> 
    15  <field name="weight" meta_type="CPS String Field"/>
     14 </field>
     15 <field name="passmark" meta_type="CPS Int Field"/>
    1616</object>

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

    r1737 r1861  
    5151          </tr>
    5252          <tr>
    53             <td valign="top"><span class="dlabel">Course Id</span>:
     53            <td valign="top"><span class="dlabel">Study Course Id</span>:
    5454            </td>
    5555            <td>
    … …  
    6767              tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
    6868            <td width="78%" tal:content="row/title"></td>
    69             <td align="center" width="10%" tal:content="row/code"></td>
    70             <td align="center" width="2%">S<span tal:content="row/semester" /></td>
    71             <td align="center" width="2%" tal:content="row/credits"></td>
    72             <td align="center" width="8%" tal:content="row/grade|string:"></td>
     69            <td width="10%" tal:content="row/code"></td>
     70            <td width="2%">S<span tal:content="row/semester" /></td>
     71            <td width="2%" tal:content="row/credits"></td>
     72            <td width="8%" tal:content="row/grade|string:"></td>
    7373          </tr>
    7474        </table>
    … …  
    8080              tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
    8181            <td width="78%" tal:content="row/title"></td>
    82             <td align="center" width="10%" tal:content="row/code"></td>
    83             <td align="center" width="2%">S<span tal:content="row/semester" /></td>
    84             <td align="center" width="2%" tal:content="row/credits"></td>
    85             <td align="center" width="8%" tal:content="row/coe|nothing"></td>
     82            <td width="10%" tal:content="row/code"></td>
     83            <td width="2%">S<span tal:content="row/semester" /></td>
     84            <td width="2%" tal:content="row/credits"></td>
     85            <td width="8%" tal:content="row/coe|nothing"></td>
    8686          </tr>
    8787          <tr>
     88            <th colspan="2" align="right">Total Credits:</th>
    8889            <td></td>
    89             <th colspan="2">Total Credits:</th>
    90             <td align="center" width="2%" tal:content="info/credits_total"></td>
     90            <td width="2%" tal:content="info/credits_total"></td>
    9191          </tr>
    9292        </table>

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

    r1071 r1861  
    1 <!-- a layout_lib macro -->
    2 <!-- $Id$ -->
    3 
    41<metal:block define-macro="default_edit"
    52  tal:define="layout options/layout;

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

    r1579 r1861  
    1 <!-- a layout_lib macro -->
    2 <!-- $Id$ -->
    31<metal:block define-macro="default_view"
    42  tal:define="layout options/layout;
    … …  
    4543        </tr>       
    4644        <tr valign="top">
    47           <td><span class="dlabel">JAMB Registration No</span>:
     45          <td><span class="dlabel">Registration No</span>:
    4846          </td>
    4947          <td>
    … …  
    6664        </tr>         
    6765        <tr valign="top">
    68           <td><span class="dlabel">Level</span>:
     66          <td><span class="dlabel">Current Session</span>:
    6967          </td>
    7068          <td>
    71             <span tal:content="info/student/level" />
     69            <span tal:content="python:context.portal_vocabularies.sessions.get(info['student']['session'])" /> 
    7270          </td>     
    7371        </tr>           
     72        <tr valign="top">
     73          <td><span class="dlabel">Current Level</span>:
     74          </td>
     75          <td>
     76            <span tal:content="python:context.portal_vocabularies.courselevel.get(info['student']['level'])" /> 
     77          </td>     
     78        </tr>             
    7479      </table>
    7580       

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

    r1516 r1861  
    1 <!-- a layout_lib macro -->
    2 <!-- $Id$ -->
    31<metal:block define-macro="default_view"
    42  tal:define="layout options/layout;

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

    r1167 r1861  
    1 <!-- a layout_lib macro -->
    2 <!-- $Id: layout_application_edit.pt 1071 2006-12-16 15:53:13Z joachim $ -->
    3 
    41<metal:block define-macro="default_edit"
    52  tal:define="layout options/layout;

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

    r1789 r1861  
    1616                       view_only info/view_only">       
    1717         
     18
     19    <div style="text-align: right"
     20         tal:condition="python:review_state in ('courses_registered','courses_validated',)">
     21    <a href="" target="slip" tal:attributes="href string:course_registration_slip"
     22        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')">
     23        <img tal:attributes="src string:${here/portal_url}/actionicon_print.png" />
     24        Course Registration Slip
     25    </a>
     26    </div>
     27
    1828         
    1929    <a href=""
    … …  
    90100          <td align="center" width="2%" tal:content="row/credits"></td>
    91101          <td align="center" width="8%" tal:content="row/coe|nothing"></td>
     102         
     103         
     104
     105
     106          <td>
     107          <a tal:condition="python:review_state == 'school_fee_paid'" href="edit" tal:attributes="href string:${row/code}/course_edit_form"
     108          target="edit"
     109          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')">
     110          [edit]
     111          </a>
     112          </td>         
     113         
     114         
    92115        </tr>
    93116        <tr>
Note: See TracChangeset for help on using the changeset viewer.