Changeset 2873 for WAeUP_SRP/base/skins

Timestamp:

7 Dec 2007, 07:32:09 (17 years ago)

Author:

joachim

Message:

fix for #428

File:

• WAeUP_SRP/base/skins/waeup_student/search_students.py (modified) (4 diffs)

WAeUP_SRP/base/skins/waeup_student/search_students.py

@@ -12 +12 @@
 list Students for ClearanceOfficers
 """
+try:
+    from Products.zdb import set_trace
+except:
+    def set_trace():
+        pass
 import logging
 logger = logging.getLogger('Skins.search_students')
@@ -66 +71 @@
 certificate_levels = fget('certificate_levels')
 dep_str = fac_str = certificate_levels_str = ''
-
 if "ClearanceOfficers" in member.getGroups():
     state = "clearance_requested"
@@ -102 +106 @@
     ca_view = True
     if certificate_levels:
-        #from Products.zdb import set_trace;set_trace()
         certificate_levels_str = certificate_levels
         certificate_levels = certificate_levels.split()
@@ -109 +112 @@
                  In('localUsersWithRoles', ("user:%s" % member,))
         res = aq_portal(query)
-
         logger.info('CourseAdviser %s initiated student_search' % member)
         certificate_levels = []
         if res:
             certificate_levels = ['/'.join(f.getPath().split('/')[-2:]) for f in res]
+            cert_ids = []
+            level_ids = []
+            for cl in certificate_levels:
+                c,l = cl.split('/')
+                level_ids += l,
+                if c not in cert_ids:
+                    cert_ids += c,
+            cert_brains = aq_portal(In("id",cert_ids))
+            end_levels = {}
+            for cert_brain in cert_brains:
+                end_levels[cert_brain.getId] = cert_brain.getObject().getContent().end_level
+            for cl in certificate_levels[:]:
+                c,l = cl.split('/')
+                for prob in (10,20):
+                    certificate_levels += "%s/%s" % (c,int(l) + prob),
+                if l == end_levels[c]:
+                    certificate_levels += "%s/%s" % (c,int(l) + 100),
         user_info['certificate_levels'] = certificate_levels
         certificate_levels_str = " ".join(certificate_levels)