Changeset 1753

Timestamp:

8 May 2007, 10:02:01 (18 years ago)

Author:

Henrik Bettermann

Message:

session_results_view without accessing returning_import
not_imported file format corrected

Location:

WAeUP_SRP/trunk

Files:

• WAeUPTool.py (modified) (2 diffs)
• profiles/default/layouts/import_student.xml (modified) (4 diffs)
• skins/waeup_student/getSessionResults.py (modified) (2 diffs)
• skins/waeup_student/session_results_view.pt (modified) (1 diff)

WAeUP_SRP/trunk/WAeUPTool.py

@@ -777 +777 @@
                 adapters = [MappingStorageAdapter(schema, item)]
                 dm = DataModel(item, adapters,context=self)
-                logger.info('Start importing from %s.csv' % name)
+                logger.info('Start importing from %s.csv' % filename)
                 import_keys = item.keys()
                 diff_set = set(import_keys).difference(set(schema.keys()))
@@ -787 +787 @@
                     logger.error('%s not in layout.' % diff_set)
                     return
-                s = '"id",'+','.join(['"%s"' % fn for fn in import_keys])
+                s = ','.join(['"%s"' % fn for fn in import_keys])
                 imported.append(s)
                 not_imported.append('%s,"Error"' % s)

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

@@ -31 +31 @@
   <property name="hidden_readonly_layout_modes"/>
   <property name="display_width">15</property>
- </widget> 
+ </widget>
  <widget name="perm_address" meta_type="String Widget">
   <property name="title">Address</property>
@@ -43 +43 @@
   <property name="hidden_readonly_layout_modes"/>
   <property name="display_width">60</property>
- </widget> 
+ </widget>
  <widget name="state" meta_type="Select Widget">
   <property name="title">State</property>
@@ -180 +180 @@
   <property name="hidden_readonly_layout_modes"/>
   <property name="display_width">10</property>
+ </widget>
+ <widget name="jamb_score" meta_type="String Widget">
+  <property name="title">JAMB Score</property>
+  <property name="fields">
+   <element value="jamb_score"/>
+  </property>
+  <property name="label">JAMB Score</property>
+  <property name="label_edit">JAMB Score</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="display_width">3</property>
  </widget> 
  <widget name="matric_no" meta_type="String Widget">
@@ -250 +262 @@
   <row>
    <cell name="jamb_reg_no"/>
+  </row>
+  <row>
+   <cell name="jamb_score"/>
   </row>  
   <row>

WAeUP_SRP/trunk/skins/waeup_student/getSessionResults.py

@@ -47 +47 @@
 student_from_cat = res[0]
 
-res = returning(matric_no = matric_no)
-if res:
-    student_from_returning = res[0]
-else:
-    return None
+#res = returning(matric_no = matric_no)
+#if res:
+#    student_from_returning = res[0]
+#else:
+#    return None
 
 res = results(matric_no = matric_no)
@@ -123 +123 @@
 info['gpa'] = gpa
 info['results'] = (sem1, sem2)
-info['student_from_returning'] = student_from_returning
+#info['student_from_returning'] = student_from_returning
 info['student'] = student_from_cat
 info['s_id'] = student_id

WAeUP_SRP/trunk/skins/waeup_student/session_results_view.pt

@@ -27 +27 @@
         </tr>
         <tr>
-          <th valign="top">Course of Study:</th><td tal:content="info/student_from_returning/Coursemajor" />                     
+          <th valign="top">Course of Study:</th><td tal:content="info/student/course" />                     
         </tr>
         <tr>