Changeset 2253

Timestamp:

17 Sep 2007, 11:14:24 (17 years ago)

Author:

Henrik Bettermann

Message:

dont't search twice for certificate levels

Location:

WAeUP_SRP/base/skins

Files:

• waeup_layout/layout_search_edit.pt (modified) (2 diffs)
• waeup_student/search_students.py (modified) (7 diffs)

WAeUP_SRP/base/skins/waeup_layout/layout_search_edit.pt

@@ -7 +7 @@
              faculties options/faculties|nothing;
              departments options/departments|nothing;
+             certificate_levels options/certificate_levels|nothing;
              "
              >
@@ -17 +18 @@
     <input type="hidden" name="departments" tal:condition="departments"
            tal:attributes="value departments">
+    <input type="hidden" name="certificate_levels" tal:condition="certificate_levels"
+           tal:attributes="value certificate_levels">           
     <div class=''>
       <div class='documentFields'>

WAeUP_SRP/base/skins/waeup_student/search_students.py

@@ -64 +64 @@
 faculties =  fget('faculties')
 departments = fget('departments')
-certificate_level = fget('certificate_level')
-dep_str = fac_str = certificate_level_str = ''
+certificate_levels = fget('certificate_levels')
+dep_str = fac_str = certificate_levels_str = ''
 
 if "ClearanceOfficers" in member.getGroups():
@@ -101 +101 @@
     only_review = False
     ca_view = True
-    if certificate_level:
+    if certificate_levels:
         #from Products.zdb import set_trace;set_trace()
-        certificate_level_str = certificate_level
-        certificate_level = certificate_level.split()
+        certificate_levels_str = certificate_levels
+        certificate_levels = certificate_levels.split()
     else:
         query = In('portal_type',('StudyLevel',)) &\
                  In('localUsersWithRoles', ("user:%s" % member,))
         res = aq_portal(query)
-        
+
         logger.info('CourseAdviser %s initiated student_search' % member)
-        certificate_level = []
-        if res:
-            certificate_level = ['/'.join(f.getPath().split('/')[-2:]) for f in res]
-        user_info['certificate_level'] = certificate_level
-        certificate_level_str = " ".join(certificate_level)
-        
+        certificate_levels = []
+        if res:
+            certificate_levels = ['/'.join(f.getPath().split('/')[-2:]) for f in res]
+        user_info['certificate_levels'] = certificate_levels
+        certificate_levels_str = " ".join(certificate_levels)
+
 default = {'search_mode': 'student_id',
         'review_state': state,
@@ -130 +130 @@
                       faculties = fac_str,
                       departments = dep_str,
-                      certificate_level = certificate_level_str,
+                      certificate_levels = certificate_levels_str,
                       commit = False,
                       )
@@ -212 +212 @@
     review_res = aq_students(query)
     logger.info('%s searches for students in review_state %s' % (member,state))
-    
+
 if co_view:
     only_review = False
@@ -222 +222 @@
     only_review = False
     with_review = True
-    courses = [cl.split('/')[0] for cl in certificate_level]
-    levels = [cl.split('/')[1] for cl in certificate_level]
+    courses = [cl.split('/')[0] for cl in certificate_levels]
+    levels = [cl.split('/')[1] for cl in certificate_levels]
     query = In('course',courses) & In('level',levels)
     res = aq_students(query)
@@ -230 +230 @@
     review_set = [r.id for r in review_res]
 
-#from Products.zdb import set_trace;set_trace() 
+#from Products.zdb import set_trace;set_trace()
 
 if only_review:
@@ -241 +241 @@
 else:
     all = search_set
-    
+
 items = all[:500]
 students = []