Changeset 1705 for WAeUP_SRP/trunk

Timestamp:

24 Apr 2007, 18:18:05 (18 years ago)

Author:

joachim

Message:

New indexes and fields

Location:

WAeUP_SRP/trunk

Files:

• WAeUPTables.py (modified) (3 diffs)
• profiles/default/schemas/student_application.xml (modified) (1 diff)
• profiles/default/schemas/student_study_course.xml (modified) (1 diff)
• profiles/default/students_catalog.xml (modified) (3 diffs)

WAeUP_SRP/trunk/WAeUPTables.py

@@ -250 +250 @@
                               'department',
                               'level',
-                              'study_mode',
+                              'mode',
                               'session',
                               'verdict',
@@ -315 +315 @@
         return getattr(doc,'current_level',None)
 
-    def get_from_doc_study_mode(self,doc):
-        "return the students study_mode"
-        if doc is None:
-            return None
-        return getattr(doc,'current_study_mode',None)
+    def get_from_doc_mode(self,doc):
+        "return the students mode"
+        if doc is None:
+            return None
+        cm = getattr(doc,'current_mode',None)
+        return cm
+        
+
+    def get_from_doc_session(self,doc):
+        "return the students current_session"
+        if doc is None:
+            return None
+        return getattr(doc,'current_session',None)
 
     def get_from_doc_entry_session(self,doc):
@@ -325 +333 @@
         if doc is None:
             return None
+        es = getattr(doc,'entry_session',None)
+        if len(es) == 2:
+            return es
         try:
             digit = int(doc.jamb_reg_no[0])

WAeUP_SRP/trunk/profiles/default/schemas/student_application.xml

@@ -7 +7 @@
  <field name="app_mobile" meta_type="CPS String Field"/>
  <field name="entry_mode" meta_type="CPS String Field"/>
+ <field name="entry_session" meta_type="CPS String Field"/>
   <field name="objection_date" meta_type="CPS DateTime Field"/>
   <field name="jamb_age" meta_type="CPS Int Field"/>

WAeUP_SRP/trunk/profiles/default/schemas/student_study_course.xml

@@ -7 +7 @@
   </field>
   <field name="current_session" meta_type="CPS String Field"/>
-  <field name="current_study_mode" meta_type="CPS String Field"/>
+  <field name="current_mode" meta_type="CPS String Field"/>
   <field name="current_level" meta_type="CPS String Field"/>
   <field name="current_verdict" meta_type="CPS String Field"/>

WAeUP_SRP/trunk/profiles/default/students_catalog.xml

@@ -31 +31 @@
   <indexed_attr value="entry_session"/>
  </index>
+ <index name="session" meta_type="FieldIndex">
+  <indexed_attr value="session"/>
+ </index>
  <index name="department" meta_type="FieldIndex">
   <indexed_attr value="department"/>
@@ -37 +40 @@
   <indexed_attr value="level"/>
  </index>
- <index name="study_mode" meta_type="FieldIndex">
-  <indexed_attr value="study_mode"/>
+ <index name="mode" meta_type="FieldIndex">
+  <indexed_attr value="mode"/>
  </index>
  <index name="verdict" meta_type="FieldIndex">
@@ -62 +65 @@
  <column value="phone"/>
  <column value="level"/>
- <column value="study_mode"/>
+ <column value="mode"/>
  <column value="verdict"/>
  <column value="entry_mode"/>
  <column value="entry_session"/>
+ <column value="session"/>
 </object>