Changeset 3667


Ignore:
Timestamp:
8 Sep 2008, 19:35:03 (16 years ago)
Author:
Henrik Bettermann
Message:

first implementations for academic reports of secondary schools

call the URL: [path to level]/academic_report_view

Location:
WAeUP_SRP/base
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/base/profiles/default/course_results.xml

    r3631 r3667  
    1111 <column value="session_id"/>
    1212 <column value="score"/>
    13  <column value="cascore"/>
     13 <column value="ca1"/>
     14 <column value="ca2"/>
     15 <column value="exam"/>
    1416 <column value="grade"/>
    1517 <column value="lecturer"/>

  • WAeUP_SRP/base/profiles/default/layouts/import_course_result.xml

    r3631 r3667  
    153153  </widget>
    154154
    155   <widget name="cascore" meta_type="Int Widget">
    156     <property name="title">CA Score</property>
     155  <widget name="ca1" meta_type="Int Widget">
     156    <property name="title">CA Score 1</property>
     157    <property name="fields">
     158      <element value="ca1"/>
     159    </property>
     160    <property name="is_required">False</property>
     161    <property name="label">CA Score 1</property>
     162    <property name="label_edit">Ca Score 1</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">100</property>
     169  </widget>
     170  <widget name="ca2" meta_type="Int Widget">
     171    <property name="title">CA Score 2</property>
    157172    <property name="fields">
    158173      <element value="cascore"/>
    159174    </property>
    160175    <property name="is_required">False</property>
    161     <property name="label">CA Score</property>
    162     <property name="label_edit">Ca Score</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">100</property>
    169   </widget> 
     176    <property name="label">CA Score 2</property>
     177    <property name="label_edit">Ca Score 2</property>
     178    <property name="readonly_layout_modes">
     179    </property>
     180    <property name="hidden_layout_modes"/>
     181    <property name="hidden_readonly_layout_modes"/>
     182    <property name="min_value">1</property>
     183    <property name="max_value">100</property>
     184  </widget>
     185  <widget name="exam" meta_type="Int Widget">
     186    <property name="title">Exam Score</property>
     187    <property name="fields">
     188      <element value="exam"/>
     189    </property>
     190    <property name="is_required">False</property>
     191    <property name="label">Exam Score</property>
     192    <property name="label_edit">Exam Score</property>
     193    <property name="readonly_layout_modes">
     194    </property>
     195    <property name="hidden_layout_modes"/>
     196    <property name="hidden_readonly_layout_modes"/>
     197    <property name="min_value">1</property>
     198    <property name="max_value">100</property>
     199  </widget>   
    170200
    171201  <widget name="grade" meta_type="Select Widget">

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

    r3631 r3667  
    8181  <property name="hidden_readonly_layout_modes"/>
    8282 </widget>
    83  <widget name="cascore" meta_type="Int Widget">
    84   <property name="title">Continuous Assessment Score</property>
     83
     84 <widget name="exam" meta_type="Int Widget">
     85  <property name="title">Exam Score</property>
    8586  <property name="fields">
    86    <element value="cascore"/>
     87   <element value="exam"/>
    8788  </property>
    88   <property name="label">Continuous Assessment Score</property>
    89   <property name="label_edit">Continuous Assessment Score</property>
     89  <property name="label">Exam Score</property>
     90  <property name="label_edit">Exam Score</property>
    9091  <property name="readonly_layout_modes">
    9192  </property>
    … …  
    9394  <property name="hidden_readonly_layout_modes"/>
    9495 </widget>
     96 <widget name="ca1" meta_type="Int Widget">
     97  <property name="title">CA Score 1</property>
     98  <property name="fields">
     99   <element value="ca1"/>
     100  </property>
     101  <property name="label">CA Score 1</property>
     102  <property name="label_edit">CA Score 1</property>
     103  <property name="readonly_layout_modes">
     104  </property>
     105  <property name="hidden_layout_modes"/>
     106  <property name="hidden_readonly_layout_modes"/>
     107 </widget>
     108 <widget name="ca2" meta_type="Int Widget">
     109  <property name="title">CA Score 2</property>
     110  <property name="fields">
     111   <element value="ca2"/>
     112  </property>
     113  <property name="label">CA Score 2</property>
     114  <property name="label_edit">CA Score 2</property>
     115  <property name="readonly_layout_modes">
     116  </property>
     117  <property name="hidden_layout_modes"/>
     118  <property name="hidden_readonly_layout_modes"/>
     119 </widget>
     120
    95121 <widget name="title" meta_type="String Widget">
    96122  <property name="title">Original Course Title</property>
    … …  
    118144  </row>
    119145  <row>
    120    <cell name="cascore"/>
    121   </row> 
     146   <cell name="ca1"/>
     147  </row>
     148  <row>
     149   <cell name="ca2"/>
     150  </row>
     151  <row>
     152   <cell name="exam"/>
     153  </row>
    122154  <row>
    123155   <cell name="core_or_elective "/>

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

    r3631 r3667  
    1010 <field name="credits" meta_type="CPS Int Field"/>
    1111 <field name="score" meta_type="CPS String Field"/>
    12  <field name="cascore" meta_type="CPS String Field"/>
     12 <field name="ca1" meta_type="CPS Int Field"/>
     13 <field name="ca2" meta_type="CPS Int Field"/>
     14 <field name="exam" meta_type="CPS Int Field"/>
    1315 <field name="grade" meta_type="CPS String Field"/>
    1416 <field name="carry_over" meta_type="CPS Boolean Field"/>

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

    r3631 r3667  
    1111 <field name="status" meta_type="CPS String Field"/>
    1212 <field name="passmark" meta_type="CPS Int Field"/>
    13  <field name="cascore" meta_type="CPS Int Field"/>
     13 <field name="ca1" meta_type="CPS Int Field"/>
     14 <field name="ca2" meta_type="CPS Int Field"/>
     15 <field name="exam" meta_type="CPS Int Field"/>
    1416</object>

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

    r3628 r3667  
    113113          <td align="center" width="2%" tal:content="row/credits"></td>
    114114          <td tal:condition="with_score" align="center" width="4%" tal:content="row/score"></td>
    115           <td tal:condition="with_cascore" align="center" width="4%" tal:content="row/cascore"></td>
     115          <td tal:condition="with_cascore" align="center" width="4%" tal:content="row/ca1"></td>
    116116          <td align="center" width="2%" tal:content="row/grade"></td>
    117117          <td align="center" width="2%" tal:content="row/weight"></td>
    … …  
    135135      <table class="contentListing" width="100%" id="folder_content">
    136136       
    137         <span tal:repeat="sem python:('1','2')">       
     137        <span tal:repeat="sem python:(('1','First Semester Courses','normal1'),('2','Second Semester Courses','normal2'),('3','Level Courses','normal3'))">       
    138138                   
    139         <tr>
     139        <tr tal:condition="python:info[sem[2]]">
    140140        <th tal:attributes="colspan python: test(show_check_boxes,'2','1')"
    141             tal:content="python: test(sem == '1','First Semester', 'Second Semester')" />
     141            tal:content="python:sem[1]" />
    142142        <th align='center'></th>
    143143        <th align='center'>sm</th>
    … …  
    151151           
    152152        </tr>               
    153         <tr tal:repeat="row python: test(sem == '1',info['normal1'],info['normal2'])"
     153        <tr tal:repeat="row python:info[sem[2]]"
     154           
    154155            tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
    155           <td align="left" valign="middle" style="width: 5%         ;"
     156          <td align="left" valign="middle" style="width: 5%;"
    156157             tal:condition="show_check_boxes">
    157158            <input type="checkbox" name="ids:list" value="" id="" class="noborder"
    … …  
    167168          <td align="center" width="2%" tal:content="row/credits"></td>
    168169          <td tal:condition="with_score" align="center" width="4%" tal:content="row/score"></td>
    169           <td tal:condition="with_cascore" align="center" width="4%" tal:content="row/cascore"></td>
     170          <td tal:condition="with_cascore" align="center" width="4%" tal:content="row/ca1"></td>
    170171          <td align="center" width="2%" tal:content="row/grade"></td>
    171172          <td align="center" width="2%" tal:content="row/weight"></td>
    … …  
    180181          </td>         
    181182        </tr>
    182 
     183        <tr><td>&nbsp;</td></tr>
    183184        </span>       
    184        
    185         <tr><th colspan="3" tal:condition="info/normal3"> Combined</th></tr>               
    186         <tr tal:condition="info/normal3" tal:repeat="row info/normal3"
    187             tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
    188           <td align="left" valign="middle" style="width: 5%;"
    189              tal:condition="show_check_boxes">
    190             <input type="checkbox" name="ids:list" value="" id="" class="noborder"
    191                    tal:define="id row/id"
    192                    tal:attributes="value id;
    193                    id python:'cb_' + id;
    194                    checked python:id in info['choosen_ids'];"
    195                    />
    196           </td>
    197           <td width="58%" tal:content="row/title"></td>
    198           <td align="center" width="10%" tal:content="row/code"></td>
    199           <td align="center" width="2%"><span tal:content="row/semester" /></td>
    200           <td align="center" width="2%" tal:content="row/credits"></td>
    201           <td tal:condition="with_score" align="center" width="4%" tal:content="row/score"></td>
    202           <td tal:condition="with_cascore" align="center" width="4%" tal:content="row/cascore"></td>
    203           <td align="center" width="2%" tal:content="row/grade"></td>
    204           <td align="center" width="2%" tal:content="row/weight"></td>
    205           <td align="center" width="10%" tal:content="row/coe|nothing"></td>
    206          
    207           <td tal:condition="submission_allowed" width="5%" align="center">
    208           <a href="edit" tal:attributes="href string:course_edit/${row/code}"
    209           target="edit_course_result"
    210           onclick="javascript:window.open('','edit_course_result','width=600, height=350, directories=no, toolbar=no, location=no, menubar=no, scrollbars=yes, status=no, resizable=no, dependent=no')">
    211           [edit]
    212           </a>
    213           </td>         
    214         </tr>       
    215185       
    216186      </table>
Note: See TracChangeset for help on using the changeset viewer.