Changeset 1971

Timestamp:

27 Jun 2007, 10:03:44 (17 years ago)

Author:

joachim

Message:

set course to core in add_course_result, return if course_id in registered_courses

Location:

WAeUP_SRP/trunk

Files:

• WAeUPTables.py (modified) (4 diffs)
• skins/waeup_student/add_course_result.py (modified) (2 diffs)

WAeUP_SRP/trunk/WAeUPTables.py

@@ -556 +556 @@
             if event_type not in ("sys_add_object","sys_del_object"):
                 return
-            #import pdb;pdb.set_trace()
             course_id = object.getId()
             if course_id.endswith('_co'):
@@ -566 +565 @@
             student_rec = res[0]
             registered_courses = getattr(student_rec,'registered_courses',[])
+            #import pdb;pdb.set_trace()
             try:
                 x = course_id in registered_courses
             except TypeError:
                 registered_courses = []
-            if event_type == "sys_add_object" and course_id not in registered_courses:
-                registered_courses.append(course_id)
+            if event_type == "sys_add_object":
+                if course_id not in registered_courses:
+                    registered_courses.append(course_id)
+                else:
+                    return
             elif event_type == "sys_del_object":
                 while course_id in registered_courses:
@@ -578 +581 @@
             data['registered_courses'] = registered_courses
             self.modifyRecord(**data)
+            return
         if pt not in self.affected_types.keys():
             return
@@ -596 +600 @@
 InitializeClass(StudentsCatalog)
 
+###)
+
+class StatisticsCatalog(StudentsCatalog): ###(
+    security = ClassSecurityInfo()
+    meta_type = 'WAeUP Statistics Catalog'
+    name = "statistics"
+    affected_types = {   ###(
+                      'StudentApplication':
+                          {'id': 'application',
+                           'fields':
+                             ('jamb_reg_no',
+                              'entry_mode',
+                              #'entry_level',
+                              'entry_session',
+                              )
+                              },
+                      'StudentClearance':
+                          {'id': 'clearance',
+                           'fields':
+                             ('matric_no',
+                              )
+                              },
+                         'StudentPersonal':
+                          {'id': 'personal',
+                           'fields':
+                             ('name',
+                              'sex',
+                              'email',
+                              'phone',
+                              )
+                              },
+                         'StudentStudyCourse':
+                          {'id': 'study_course',
+                           'fields':
+                             ('course',
+                              'faculty',
+                              'department',
+                              'level',
+                              'mode',
+                              'session',
+                              'verdict',
+                              )
+                              },
+                         }
+    ###)
+
+
+InitializeClass(StudentsCatalog)
 ###)
 

WAeUP_SRP/trunk/skins/waeup_student/add_course_result.py

@@ -37 +37 @@
 args = {}
 err = ''
+d['core_or_elective'] = True
 while True:
     if not course_id:
@@ -64 +65 @@
 
 cr_id = context.invokeFactory('StudentCourseResult',course_id)
-#set_trace()
 cr = getattr(context,cr_id)
 context.portal_workflow.doActionFor(cr,'open')