Changeset 1498 for WAeUP_SRP/trunk

Timestamp:

26 Feb 2007, 16:00:26 (18 years ago)

Author:

joachim

Message:

create level respects now passmark if present
reindexCoursesCatalog must be run first, done on uniben-demo

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_student/create_level.py (modified) (4 diffs)
• waeup_utilities/reindexCoursesCatalog.py (added)

WAeUP_SRP/trunk/skins/waeup_student/create_level.py

@@ -14 +14 @@
 from Products.AdvancedQuery import Eq, Between, Le,In
 aq_portal = context.portal_catalog.evalAdvancedQuery
+aq_courses = context.courses_catalog.evalAdvancedQuery
 
 current = DateTime.DateTime()
@@ -21 +22 @@
 redirect = response.redirect
 logger = logging.getLogger('Student.create_level')
-students = context.portal_directories.students
 mtool = context.portal_membership
 member = mtool.getAuthenticatedMember()
@@ -49 +49 @@
 results = context.results_import(matric_no = student.matric_no)
 if results:
-    carry_overs = [brain for brain in results if brain.GRADE in ('D','E','F')]
-    #carry_overs = [brain for brain in results if int(brain.Score) < 40 ]
+    #carry_overs = [brain for brain in results if brain.GRADE in ('D','E','F')]
     l = []
+    carry_overs = results
     for co in carry_overs:
+        carry_over = False
+        query = Eq('code',co.CosCode)
+        c_res = aq_courses(query)
+        if not c_res:
+            logger.info('"%s","%s course not found in courses catalog"' % (student.id,co.CosCode))
+            continue
+        course_cat_entry = c_res[0]
+        if not course_cat_entry.passmark:
+            carry_over = co.GRADE in ('D','E','F')
+        else:
+            try:
+                score = int(co.Score)
+            except:
+                logger.info('"%s"," course %s invalid score %s"' % (student.id,
+                                                                    co.CosCode,
+                                                                    co.Score))
+                continue
+            if int(c_res[0].passmark) <= score:  
+                continue
+            carry_over = True
+        if not carry_over:
+            continue
         d = context.getCourseInfo(co.CosCode)
         d['grade'] = co.GRADE
@@ -77 +99 @@
         course_result.getContent().edit(mapping=d)
 session.set('in_progress','finished')
+return
 return response.redirect("%s" % level.absolute_url())