Changeset 5037 for WAeUP_SRP/trunk

Timestamp:

23 Feb 2010, 11:08:14 (15 years ago)

Author:

Henrik Bettermann

Message:

show validation data

change level voc

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/layouts/import_student_study_level.xml (modified) (1 diff)
• skins/waeup_student/getStudyLevelInfo.py (modified) (1 diff)

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

@@ -53 +53 @@
   </widget>
 
- <widget name="code" meta_type="WAeUP Level Widget">
-  <property name="title">Level No</property>
+ <widget name="code" meta_type="Select Widget">
+  <property name="title">Level</property>
+  <property name="is_required">True</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"/>
-  <property name="vocabulary">unset</property>
-  <property name="sorted">True</property>
+  <property name="vocabulary">student_levels</property>
  </widget>
+
+
  <widget name="session" meta_type="WAeUP Session Widget">
   <property name="title">Session</property>

WAeUP_SRP/trunk/skins/waeup_student/getStudyLevelInfo.py

@@ -50 +50 @@
 info['validation_allowed']= review_state == 'courses_registered' and is_current_level
 info['rejection_allowed']= review_state in ('courses_registered', 'courses_validated',) and is_current_level
-info['validated'] = review_state in ('courses_validated','returning') and is_current_level
+info['validated'] = level_doc.validated_by
 
 info['show_check_boxes'] =  (is_ca and school_fee_paid and is_current_level and not has_verdict) or\