Changeset 3980

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:

• profiles/default/layouts/course.xml (modified) (1 diff)
• profiles/default/layouts/student_study_level.xml (modified) (1 diff)
• profiles/default/schemas/student_study_level.xml (modified) (1 diff)
• profiles/default/vocabularies.xml (modified) (1 diff)
• profiles/default/vocabularies/semester_voc.xml (deleted)
• skins/waeup_student/course_registration_slip.pt (modified) (3 diffs)

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

@@ -104 +104 @@
  </widget>
  <widget name="semester" meta_type="Int Widget">
-  <property name="title">Semester</property>
+  <property name="title">Semester/Term</property>
   <property name="fields">
    <element value="semester"/>
   </property>
-  <property name="label">Semester</property>
-  <property name="label_edit">Semester</property>
+  <property name="label">Semester/Term</property>
+  <property name="label_edit">Semester/Term (1, 2 or 3)</property>
   <property name="readonly_layout_modes"/>
   <property name="hidden_layout_modes"/>
   <property name="hidden_readonly_layout_modes"/>
+  <property name="is_limited">True</property>
+  <property name="min_value">1</property>
+  <property name="max_value">3</property>
  </widget>
+
  <widget name="title" meta_type="String Widget">
   <property name="title">Course Title</property>

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

@@ -8 +8 @@
  <property name="flexible_widgets"/>
  <property name="validate_values_expr"></property>
- <widget name="code" meta_type="String Widget">
-  <property name="title">Level No</property>
-  <property name="fields">
-   <element value="code"/>
-  </property>
-  <property name="is_required">True</property>
-  <property name="label">Level No</property>
-  <property name="label_edit">Level No</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes">
-   <element value="edit"/>
-   <element value="view"/>
-  </property>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
  <widget name="session" meta_type="String Widget">
   <property name="title">Session</property>

WAeUP_SRP/trunk/profiles/default/schemas/student_study_level.xml

@@ -2 +2 @@
 <?xml-stylesheet type="text/xsl" href="schema.xsl"?>
 <object name="student_study_level" meta_type="CPS Schema">
- <field name="code" meta_type="CPS String Field"/>
  <field name="session" meta_type="CPS String Field"/>
  <field name="verdict" meta_type="CPS String Field"/>

WAeUP_SRP/trunk/profiles/default/vocabularies.xml

@@ -60 +60 @@
  <object name="waeup_block_letters" meta_type="CPS Vocabulary"/>
  <object name="nigerian_states" meta_type="CPS Vocabulary"/>
- <object name="semester_voc" meta_type="CPS Vocabulary"/>
  <object name="local_gov_areas" meta_type="CPS Vocabulary"/>
  <object name="states" meta_type="CPS Vocabulary"/>

WAeUP_SRP/trunk/skins/waeup_student/course_registration_slip.pt

@@ -76 +76 @@
 
 
-       <span tal:repeat="sem python:('1','2')">       
-                    
-        <tr><th colspan="3" tal:content="python: test(sem == '1','First Semester', 'Second Semester')" /></tr>            
+        <span tal:repeat="sem python:('1','2')">       
+        <tr><th colspan="3" tal:content="python: test(sem == '1','First Semester Courses', 'Second Semester Courses')" /></tr>            
         <tr tal:repeat="row python: test(sem == '1',info['normal1'],info['normal2'])"
             tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
@@ -87 +86 @@
           <td align="center" width="10%" tal:content="row/coe|nothing"></td>     
         </tr>
+        </span>         
         
-        
-        <th colspan="3" tal:condition="info/normal3"> Combined</th>                
+        <th colspan="3" tal:condition="info/normal3">Level Courses</th>                
         <tr tal:condition="info/normal3" tal:repeat="row info/normal3"
             tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
@@ -102 +101 @@
         </tr>        
         
-        </span>        
+       
           <tr>
             <td width="84%" colspan="2" align="right">Total Credits:</td>