Changeset 2478

Timestamp:

30 Oct 2007, 13:19:19 (17 years ago)

Author:

Henrik Bettermann

Message:

enable import of previous_verdict

Location:

WAeUP_SRP

Files:

• base/WAeUPTool.py (modified) (2 diffs)
• base/skins/waeup_utilities/fix06Verdict.py (modified) (1 diff)
• fceokene/profiles/default/layouts/import_student.xml (modified) (2 diffs)
• fceokene/profiles/default/schemas/import_student.xml (modified) (1 diff)

WAeUP_SRP/base/WAeUPTool.py

@@ -1229 +1229 @@
                               'current_mode',
                               'current_verdict',
+                              'previous_verdict',
                               )
                               },
@@ -1357 +1358 @@
                 for field in intersect:
                     changed = False
-                    if getattr(sub_doc,field) != mapping.get(field,''):
+                    if getattr(sub_doc,field,None) != mapping.get(field,''):
                         any_change = True
                         changed = True

WAeUP_SRP/base/skins/waeup_utilities/fix06Verdict.py

@@ -33 +33 @@
 #logger.info('')
 
-query = ~ Eq('verdict','N/A') & In('session',('2006/2007','06','6'))
+query = ~ Eq('verdict','N/A') & ~ Eq('verdict','') & In('session',('2006/2007','06','6'))
 brains = aq_students(query)
 total = len(brains)

WAeUP_SRP/fceokene/profiles/default/layouts/import_student.xml

@@ -203 +203 @@
   <property name="sorted">True</property>
  </widget>
+ <widget name="previous_verdict" meta_type="WAeUP Verdict Widget">
+  <property name="title">Previous Verdict</property>
+  <property name="fields">
+   <element value="previous_verdict"/>
+  </property>
+  <property name="label">Previous Verdict</property>
+  <property name="label_edit">Previous Verdict</property>
+  <property name="description">The verdict of the previous level</property>
+  <property name="help">The verdict of the previous level</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">verdicts</property>
+  <property name="sorted">True</property>
+ </widget> 
  <widget name="entry_session" meta_type="WAeUP Session Widget">
   <property name="title">Entry Session</property>
@@ -386 +401 @@
   </row>
   <row>
+   <cell name="previous_verdict"/>
+  </row>  
+  <row>
    <cell name="jamb_reg_no"/>
   </row>

WAeUP_SRP/fceokene/profiles/default/schemas/import_student.xml

@@ -26 +26 @@
  <field name="current_session" meta_type="CPS String Field"/>
  <field name="current_verdict" meta_type="CPS String Field"/>
+ <field name="previous_verdict" meta_type="CPS String Field"/>
  <field name="current_mode" meta_type="CPS String Field"/>
  <field name="perm_address" meta_type="CPS String Field"/>