Changeset 3780

Timestamp:

21 Nov 2008, 09:26:51 (16 years ago)

Author:

Henrik Bettermann

Message:

• get study_mode from certificates and ignore study_mode attribute of study_course objects

• customize school_fee payment for FUTMinna

Location:

WAeUP_SRP/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• WAeUPImport.py (modified) (1 diff)
• WAeUPTables.py (modified) (2 diffs)
• WAeUPTool.py (modified) (3 diffs)
• profiles/default/layouts/student_study_course.xml (modified) (1 diff)
• profiles/futminna/layouts/members.xml (modified) (1 diff)
• skins/waeup_futminna/getSchoolFee.py (added)
• skins/waeup_futminna/pay_interswitch.py (added)
• skins/waeup_utilities/ti_507_resolve.py (modified) (2 diffs)

WAeUP_SRP/trunk/CHANGES.txt

@@ -122 +122 @@
 -----------------
 - enable random bed booking order
+
+1.24 (2008-11-20)
+-----------------
+- get study_mode from certificates and ignore study_mode attribute of study_course objects

WAeUP_SRP/trunk/WAeUPImport.py

@@ -742 +742 @@
                               'current_level',
                               'current_session',
-                              'current_mode',
+                              'current_mode',  #is no longer used and visible but can still be imported
                               'current_verdict',
                               'previous_verdict',

WAeUP_SRP/trunk/WAeUPTables.py

@@ -867 +867 @@
                         'end_level', # from certificate
                         'level', # current_level
-                        'mode',  # current_mode
+                        'mode',  # from certificate
                         'session', # current_session
                         'verdict', # current_verdict
@@ -966 +966 @@
         return getattr(doc,'current_level',None)
 
+    #def get_from_doc_mode(self,doc,cached_data={}):
+    #    "return the students mode"
+    #    if doc is None:
+    #        return None
+    #    cm = getattr(doc,'current_mode',None)
+    #    return cm
+    
     def get_from_doc_mode(self,doc,cached_data={}):
         "return the students mode"
         if doc is None:
             return None
-        cm = getattr(doc,'current_mode',None)
-        return cm
+        if hasattr(self,"_v_certificates") and self._v_certificates.has_key(doc.study_course):
+            return self._v_certificates[doc.study_course]['study_mode']
+        certificate_res = self.portal_catalog(id = doc.study_course)
+        if len(certificate_res) != 1:
+            return None
+        return getattr(certificate_res[0].getObject().getContent(),'study_mode','unknown')    
 
 

WAeUP_SRP/trunk/WAeUPTool.py

@@ -868 +868 @@
         dsc['current_level'] = level
         dsc['current_verdict'] = verdict
-        dsc['current_mode'] = em
+        dsc['current_mode'] = em   #no longer used
         dsc['current_session'] = '05'
         studycourse.getContent().edit(mapping=dsc)
@@ -1041 +1041 @@
         # because ug_ft has two different entry modes
                         
-        if brain.entry_mode:  
-            da['entry_mode'] = brain.entry_mode  
+        if brain.entry_mode:                      # does not happen because import_application 
+            da['entry_mode'] = brain.entry_mode   # schema has no field entry_mode
         elif brain.screening_type == 'pume':  
             da['entry_mode'] = 'ume_ft'  
@@ -1116 +1116 @@
         dsc['study_course'] = brain.course_admitted
         dsc['current_verdict'] = ''
-        dsc['current_mode'] = da['entry_mode']
+        dsc['current_mode'] = da['entry_mode'] # no longer used
         if da['entry_mode'].startswith('de'):
             dsc['current_level'] = '200'

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

@@ -119 +119 @@
    <cell name="current_level"/>
   </row>
-  <row>
-   <cell name="current_mode"/>
-  </row>
  </table>
 </object>

WAeUP_SRP/trunk/profiles/futminna/layouts/members.xml

@@ -116 +116 @@
   <property name="display_width">20</property>
   <property name="size_max">0</property>
-  <property name="check_words">fceokene</property>
+  <property name="check_words">minna</property>
  </widget>
 <widget name="roles" meta_type="Generic MultiSelect Widget">

WAeUP_SRP/trunk/skins/waeup_utilities/ti_507_resolve.py

@@ -69 +69 @@
             d['study_course'] = student.course
             d['matric_no'] = student.matric_no
+            d['entry_mode'] = student.entry_mode
             wrong[student.id] = d
             if (student.mode,study_mode) not in (('ume_ft', 'ug_ft'),('de_pt', 'ug_pt'),('de_ft', 'ug_ft')):
-                logger.info("; %(student_id)s;  %(matric_no)s ; %(study_course)s ; %(current_mode_old)s ; %(current_mode)s" % d)
+                logger.info("; %(student_id)s;  %(matric_no)s ; %(study_course)s ; %(entry_mode)s ; %(current_mode_old)s ; %(current_mode)s" % d)
     # if wrong and not (len(wrong) % commit_after):
     #     logger.info('found %d wrong of %d' % (len(wrong),count))
@@ -81 +82 @@
 
 return
+
+# the following must not be done because I've changed get_from_doc_mode in WAeUPTables. The current_mode field
+# of the study_course object is no longer used
 
 for student_id,d in wrong.items():