Changeset 1033 for WAeUP_SRP/trunk/skins

Timestamp:

12 Dec 2006, 11:05:00 (18 years ago)

Author:

joachim

Message:

search for department included
search for student_id now directly goes to the Student.

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• get_searchable_student_states.py (modified) (1 diff)
• search_students.py (modified) (6 diffs)

WAeUP_SRP/trunk/skins/waeup_student/get_searchable_student_states.py

@@ -21 +21 @@
     return voc.get(key)
 if "ClearanceOfficers" in member.getGroups():
-    return [item for item in voc.items() if item[0].startswith('clear')]
+    return [item for item in voc.items() if item[0].startswith('clear') or
+                                         item[0] in ("all",)]
 return voc.items()
 

WAeUP_SRP/trunk/skins/waeup_student/search_students.py

@@ -13 +13 @@
 """
 request = REQUEST
+form = request.form
+fget = form.get
 wftool = context.portal_workflow
 mtool = context.portal_membership
 member = mtool.getAuthenticatedMember()
 roles = member.getRolesInContext(context)
+students_folder = context.portal_url.getPortalObject().campus.students
 try:
     from Products.AdvancedQuery import Eq, Between, Le,In
@@ -28 +31 @@
     return -1
 
-request = context.REQUEST
-form = request.form
-fget = form.get
 student_subobjects = ("StudentApplication",
                       "StudentPersonal",
@@ -82 +82 @@
 with_review = state != "all"
 only_review = with_review and not term
-##with_level_results = state.startswith("category") or\
-##                     state in ('content_addable',) and\
-##                     evalAdvancedQuery is not None
 bools = "with_review = %s<br\> only_review = %s<br\>" % (with_review,only_review)
 if not term and not with_review:
@@ -109 +106 @@
     if what == "student_id":
         query_step = 1
-        query = Eq('portal_type','Student') & Eq('id', term.strip())
+        if hasattr(students_folder,term.strip()):
+            request.RESPONSE.redirect("%s/%s" % (students_folder.absolute_url(),term))
+        return context.search_students_form(rendered = rend,
+                             psm = "No student found!",
+                             students = [],
+                             allowed = True,
+                             )
     elif what in st_queries:
         if what == "jamb_reg_no":
@@ -124 +127 @@
             st = "%s" % term.strip()
         query = In('portal_type',pt) & Eq('SearchableText',"%s*" % term.strip())
-    res = evalAdvancedQuery(query)
-if with_review:
-    query_step += 10
-    review_res = evalAdvancedQuery(In('portal_type',student_objects) & Eq('review_state',state))
-search_set = []
-if res:
-    for r in res:
-        pl = r.getPath().split('/')
-        search_set.append(pl[pl.index('students') + 1])
-review_set = []
-if review_res:
-    for r in review_res:
-        pl = r.getPath().split('/')
-        review_set.append(pl[pl.index('students') + 1])
+        res = evalAdvancedQuery(query)
+        if with_review:
+            query_step += 10
+            review_res = evalAdvancedQuery(In('portal_type',student_objects) & Eq('review_state',state))
+        search_set = []
+        if res:
+            for r in res:
+                pl = r.getPath().split('/')
+                search_set.append(pl[pl.index('students') + 1])
+        review_set = []
+        if review_res:
+            for r in review_res:
+                pl = r.getPath().split('/')
+                review_set.append(pl[pl.index('students') + 1])
+    elif what == "department":
+        res = context.students_catalog(department=term.strip())
+        search_set = [r.id for r in res]
 all = []
 if only_review:
@@ -147 +153 @@
 else:
     all = search_set
-for a in all[:100]:
+for a in all[:1000]:
     if a in items:
         continue