Changeset 2503

Timestamp:

2 Nov 2007, 18:16:19 (17 years ago)

Author:

Henrik Bettermann

Message:

seperate add_student and import_student layouts.xml
fix import_student layout (email was overwritten)

Location:

WAeUP_SRP

Files:

• base/WAeUPTables.py (modified) (3 diffs)
• base/skins/waeup_student/add_student.py (modified) (1 diff)
• fceokene/profiles/default/layouts.xml (modified) (1 diff)
• fceokene/profiles/default/layouts/add_student.xml (added)
• fceokene/profiles/default/layouts/application_pce.xml (modified) (1 diff)
• fceokene/profiles/default/layouts/import_student.xml (modified) (4 diffs)
• fceokene/profiles/default/schemas.xml (modified) (1 diff)
• fceokene/profiles/default/schemas/add_student.xml (added)
• fceokene/profiles/default/schemas/import_student.xml (modified) (1 diff)

WAeUP_SRP/base/WAeUPTables.py

@@ -344 +344 @@
             ds = DataStructure(data=item,datamodel=dm)
             error_string = ""
+            #import pdb;pdb.set_trace()
             for k in import_keys:
                 if not validators[k](ds,mode=mode):
@@ -609 +610 @@
     def new_importCSV(self,filename="JAMB_data",
                   schema_id="application",
-                  layout_id="application_import",
+                  layout_id="import_application",
                   mode='add'):
         """ import JAMB data """
@@ -1373 +1374 @@
             else:
                 normal.append(d)
-        normal.sort(cmp=lambda x,y: cmp("%(semester)s%(code)s" % x, 
+        normal.sort(cmp=lambda x,y: cmp("%(semester)s%(code)s" % x,
                                         "%(semester)s%(code)s" % y))
-        carry_overs.sort(cmp=lambda x,y: cmp("%(semester)s%(code)s" % x, 
+        carry_overs.sort(cmp=lambda x,y: cmp("%(semester)s%(code)s" % x,
                                              "%(semester)s%(code)s" % y))
         return credits,carry_overs,normal

WAeUP_SRP/base/skins/waeup_student/add_student.py

@@ -19 +19 @@
 d = {}
 mode = 'edit'
-rendered,psm,ds = lt.renderLayout(layout_id= 'import_student',
-                      schema_id= 'import_student',
+rendered,psm,ds = lt.renderLayout(layout_id= 'add_student',
+                      schema_id= 'add_student',
                       context=context,
                       mapping=validate and REQUEST,

WAeUP_SRP/fceokene/profiles/default/layouts.xml

@@ -24 +24 @@
   <object name="import" meta_type="CPS Layout"/>
   <object name="import_student" meta_type="CPS Layout"/>
+  <object name="add_student" meta_type="CPS Layout"/>
   <object name="members" meta_type="CPS Layout"/>
   <object name="members_search" meta_type="CPS Layout"/>

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

@@ -9 +9 @@
   <property name="validate_values_expr"></property>
 
+  <widget name="jamb_age" meta_type="String Widget">
+    <property name="title">Age</property>
+    <property name="fields">
+      <element value="jamb_age"/>
+    </property>
+    <property name="label">Age</property>
+    <property name="label_edit">Age</property>
+    <property name="description"></property>
+    <property name="help"></property>
+    <property name="is_i18n">False</property>
+    <property name="widget_mode_expr"></property>
+    <property name="readonly_layout_modes">
+      <element value="edit"/>
+    </property>
+    <property name="hidden_layout_modes">
+      <element value="create"/>
+    </property>
+    <property name="hidden_readonly_layout_modes"/>
+    <property name="css_class_expr">string:row</property>
+  </widget>
   <widget name="date_of_birth" meta_type="DateTime Widget">
     <property name="title">Date of Birth</property>

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

@@ -12 +12 @@
   <property name="title">Id</property>
   <property name="fields">
-   <element value="email"/>
+   <element value="id"/>
   </property>
   <property name="is_required">False</property>
@@ -49 +49 @@
   <property name="title">Application Email</property>
   <property name="fields">
-   <element value="email"/>
+   <element value="app_email"/>
   </property>
   <property name="is_required">False</property>
@@ -217 +217 @@
   <property name="vocabulary">verdicts</property>
   <property name="sorted">True</property>
- </widget> 
+ </widget>
  <widget name="entry_session" meta_type="WAeUP Session Widget">
   <property name="title">Entry Session</property>
@@ -363 +363 @@
   <property name="display_width">10</property>
  </widget>
- <table>
-  <row>
-   <cell name="firstname"/>
-  </row>
-  <row>
-   <cell name="middlename"/>
-  </row>
-  <row>
-   <cell name="lastname"/>
-  </row>
-  <row>
-   <cell name="sex"/>
-  </row>
-  <row>
-   <cell name="email"/>
-  </row>
-  <row>
-   <cell name="phone"/>
-  </row>
-  <row>
-   <cell name="entry_mode"/>
-  </row>
-  <row>
-   <cell name="current_mode"/>
-  </row>
-  <row>
-   <cell name="entry_session"/>
-  </row>
-  <row>
-   <cell name="current_session"/>
-  </row>
-  <row>
-   <cell name="current_level"/>
-  </row>
-  <row>
-   <cell name="current_verdict"/>
-  </row>
-  <row>
-   <cell name="previous_verdict"/>
-  </row>  
-  <row>
-   <cell name="jamb_reg_no"/>
-  </row>
-  <row>
-   <cell name="jamb_score"/>
-  </row>
-  <row>
-   <cell name="matric_no"/>
-  </row>
-  <row>
-   <cell name="study_course"/>
-  </row>
-
- </table>
 </object>

WAeUP_SRP/fceokene/profiles/default/schemas.xml

@@ -26 +26 @@
  <object name="import" meta_type="CPS Schema"/>
  <object name="import_student" meta_type="CPS Schema"/>
+ <object name="add_student" meta_type="CPS Schema"/> 
  <object name="import_student_level_data" meta_type="CPS Schema"/>
  <object name="import_student_course_results" meta_type="CPS Schema"/>

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

@@ -15 +15 @@
  <field name="jamb_score" meta_type="CPS Int Field"/>
  <field name="jamb_age" meta_type="CPS String Field"/>
+ <field name="jamb_lga" meta_type="CPS String Field"/>
+ <field name="jamb_state" meta_type="CPS String Field"/>
  <field name="lga" meta_type="CPS String Field"/>
  <field name="state" meta_type="CPS String Field"/>