Changeset 3980 for WAeUP_SRP/trunk


Ignore:
Timestamp:
26 Feb 2009, 15:30:11 (16 years ago)
Author:
Henrik Bettermann
Message:

remove code from student_study_level (only id is used)
define min and max for semester attribute in course
fix course_registration_slip

Location:
WAeUP_SRP/trunk
Files:
1 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • WAeUP_SRP/trunk/profiles/default/layouts/course.xml

    r3689 r3980  
    104104 </widget>
    105105 <widget name="semester" meta_type="Int Widget">
    106   <property name="title">Semester</property>
     106  <property name="title">Semester/Term</property>
    107107  <property name="fields">
    108108   <element value="semester"/>
    109109  </property>
    110   <property name="label">Semester</property>
    111   <property name="label_edit">Semester</property>
     110  <property name="label">Semester/Term</property>
     111  <property name="label_edit">Semester/Term (1, 2 or 3)</property>
    112112  <property name="readonly_layout_modes"/>
    113113  <property name="hidden_layout_modes"/>
    114114  <property name="hidden_readonly_layout_modes"/>
     115  <property name="is_limited">True</property>
     116  <property name="min_value">1</property>
     117  <property name="max_value">3</property>
    115118 </widget>
     119
    116120 <widget name="title" meta_type="String Widget">
    117121  <property name="title">Course Title</property>
  • WAeUP_SRP/trunk/profiles/default/layouts/student_study_level.xml

    r3689 r3980  
    88 <property name="flexible_widgets"/>
    99 <property name="validate_values_expr"></property>
    10  <widget name="code" meta_type="String Widget">
    11   <property name="title">Level No</property>
    12   <property name="fields">
    13    <element value="code"/>
    14   </property>
    15   <property name="is_required">True</property>
    16   <property name="label">Level No</property>
    17   <property name="label_edit">Level No</property>
    18   <property name="readonly_layout_modes"/>
    19   <property name="hidden_layout_modes">
    20    <element value="edit"/>
    21    <element value="view"/>
    22   </property>
    23   <property name="hidden_readonly_layout_modes"/>
    24  </widget>
    2510 <widget name="session" meta_type="String Widget">
    2611  <property name="title">Session</property>
  • WAeUP_SRP/trunk/profiles/default/schemas/student_study_level.xml

    r3689 r3980  
    22<?xml-stylesheet type="text/xsl" href="schema.xsl"?>
    33<object name="student_study_level" meta_type="CPS Schema">
    4  <field name="code" meta_type="CPS String Field"/>
    54 <field name="session" meta_type="CPS String Field"/>
    65 <field name="verdict" meta_type="CPS String Field"/>
  • WAeUP_SRP/trunk/profiles/default/vocabularies.xml

    r3689 r3980  
    6060 <object name="waeup_block_letters" meta_type="CPS Vocabulary"/>
    6161 <object name="nigerian_states" meta_type="CPS Vocabulary"/>
    62  <object name="semester_voc" meta_type="CPS Vocabulary"/>
    6362 <object name="local_gov_areas" meta_type="CPS Vocabulary"/>
    6463 <object name="states" meta_type="CPS Vocabulary"/>
  • WAeUP_SRP/trunk/skins/waeup_student/course_registration_slip.pt

    r3475 r3980  
    7676
    7777
    78        <span tal:repeat="sem python:('1','2')">       
    79                    
    80         <tr><th colspan="3" tal:content="python: test(sem == '1','First Semester', 'Second Semester')" /></tr>           
     78        <span tal:repeat="sem python:('1','2')">       
     79        <tr><th colspan="3" tal:content="python: test(sem == '1','First Semester Courses', 'Second Semester Courses')" /></tr>           
    8180        <tr tal:repeat="row python: test(sem == '1',info['normal1'],info['normal2'])"
    8281            tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
     
    8786          <td align="center" width="10%" tal:content="row/coe|nothing"></td>     
    8887        </tr>
     88        </span>         
    8989       
    90        
    91         <th colspan="3" tal:condition="info/normal3"> Combined</th>               
     90        <th colspan="3" tal:condition="info/normal3">Level Courses</th>               
    9291        <tr tal:condition="info/normal3" tal:repeat="row info/normal3"
    9392            tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
     
    102101        </tr>       
    103102       
    104         </span>       
     103       
    105104          <tr>
    106105            <td width="84%" colspan="2" align="right">Total Credits:</td>
Note: See TracChangeset for help on using the changeset viewer.