Changeset 841

Timestamp:

11 Nov 2006, 13:32:24 (18 years ago)

Author:

joachim

Message:

add vocabularies for subjects and grades according to Kehindes Data
use them in clearance form.

Location:

WAeUP_SRP/trunk

Files:

• Widgets.py (modified) (2 diffs)
• profiles/default/vocabularies.xml (modified) (1 diff)
• profiles/default/vocabularies/exam_grades.xml (added)
• profiles/default/vocabularies/exam_subjects.xml (added)
• skins/waeup_student/widget_waeup_result_render.pt (modified) (4 diffs)

WAeUP_SRP/trunk/Widgets.py

@@ -329 +329 @@
         v = datamodel[self.fields[0]]
         #import pdb;pdb.set_trace()
-        #clear_doc = self.getStudentInfo()['clear_doc']
-        #vd = getattr(clear_doc,self.fields[0],None)
-##        if not vd:
-##            vd = []
         widget_id = self.getWidgetId()
         datastructure[widget_id] = v
@@ -384 +380 @@
             raise RuntimeError("Unknown Render Method %s for widget type %s"
                                % (render_method, self.getId()))
-
-        # XXX AT: datastructure has to be set again here, in case we're in edit
-        # or create mode, because a default value has to be provided.
         #import pdb;pdb.set_trace()
         datamodel = datastructure.getDataModel()

WAeUP_SRP/trunk/profiles/default/vocabularies.xml

@@ -3 +3 @@
  <property name="title"></property>
  <object name="courselevel" meta_type="CPS Vocabulary"/>
+ <object name="exam_subjects" meta_type="CPS Vocabulary"/>
+ <object name="exam_types" meta_type="CPS Vocabulary"/>
+ <object name="exam_grades" meta_type="CPS Vocabulary"/>
  <object name="institution_types_voc" meta_type="CPS Vocabulary"/>
  <object name="get_departments_voc" meta_type="CPS Method Vocabulary"/>

WAeUP_SRP/trunk/skins/waeup_student/widget_waeup_result_render.pt

@@ -6 +6 @@
                    subject options/datastructure/?id_s;
                    grade options/datastructure/?id_g;
+                   grade_voc context/portal_vocabularies/exam_grades;   
+                   subjects_voc context/portal_vocabularies/exam_subjects;   
 ">
 <tal:block condition="python: mode == 'view'">
     <div tal:repeat="res results">
-      <span tal:repeat="col res"><span tal:content="col" />&nbsp;&nbsp;</span>
+      <span tal:content="python:subjects_voc.get(res[0])" />&nbsp;&nbsp;<span tal:content="python:grade_voc.get(res[1])" />
     </div>
 </tal:block>
@@ -17 +19 @@
     <tr><th>Subject</th><th>Grade</th>
     <tr tal:repeat="res results">
-      <td tal:repeat="col res" tal:content="col" /> 
+      <td tal:content="python:subjects_voc.get(res[0])" /><td tal:content="python:grade_voc.get(res[1])" />
     </tr>
     <tr>
@@ -23 +25 @@
                   tal:attributes="name string:${name}_s;
                   id string:${name}_s;">
-              <option tal:repeat="sub python:(('','----'),('Mathematics','Mathematics'),('English','English'))"
+              <option tal:repeat="sub subjects_voc/items"
                       tal:attributes="value python:sub[0]"
                       tal:content="python: sub[1]">
@@ -33 +35 @@
                   tal:attributes="name string:${name}_g;
                   id string:${name}_g;">
-                  <option tal:repeat="sub python:(('','-'),('A','A'),('B','B'),('C','C'),('D','D'))"
+                  <option tal:repeat="sub grade_voc/items"
                           tal:attributes="value python:sub[0]"
                           tal:content="python: sub[1]">