Changeset 971 for WAeUP_SRP/trunk/skins/waeup_student

Timestamp:

30 Nov 2006, 19:31:01 (18 years ago)

Author:

joachim

Message:

modified pumeresults upload to update results
filename must be pup_update
IMPORTANT the heading must be the same as in the first upload.
Resolved PUME Results contains a different heading.
Import of admitted Students with pictures
students_catalog created
searchStudents speedup

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• getStudentInfo.py (modified) (1 diff)
• search_students.py (modified) (4 diffs)
• search_students_form.pt (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_student/getStudentInfo.py

@@ -34 +34 @@
 student_path = "%s/campus/students/%s" % (context.portal_url.getPortalPath(),student_id)
 student = context.restrictedTraverse(student_path,default=None)
+#from Products.zdb import set_trace
+#set_trace()
+
 if student is None or student.portal_type != 'Student':
     return None

WAeUP_SRP/trunk/skins/waeup_student/search_students.py

@@ -62 +62 @@
                       ob=default,
                       layout_mode='edit',
-                      formaction="search_students"
+                      formaction="search_students",
+                      commit = False,
                       )
 if psm == '':
@@ -68 +69 @@
                              psm = psm,
                              #psm = "%s, %s" % (psm,ds),
-                             students = items,
+                             students = [],
                              allowed = True,
                              )
@@ -127 +128 @@
 if res:
     for r in res:
-        if r.portal_type in ("StudentStudyLevel",):
-            student = r.getObject().aq_parent.aq_parent
-        elif r.portal_type in student_subobjects:
-            student = r.getObject().aq_parent
-        else:
-            student = r.getObject()
-        search_set.append(student)
+        pl = r.getPath().split('/')
+        search_set.append(pl[pl.index('students') + 1])
 review_set = []
 if review_res:
     for r in review_res:
-        if r.portal_type in ("StudentStudyLevel",):
-            student = r.getObject().aq_parent.aq_parent
-        elif r.portal_type in student_subobjects:
-            student = r.getObject().aq_parent
-        else:
-            student = r.getObject()
-        review_set.append(student)
+        pl = r.getPath().split('/')
+        review_set.append(pl[pl.index('students') + 1])
 all = []
 if only_review:
@@ -158 +149 @@
     items.append(a)
 students = []
-items.sort(cmp_id)
+items.sort()
 co_view = False
 if items:
     for item in items:
         #if context.isClearanceOfficer(info):
+        info = {}
         if "ClearanceOfficers" in member.getGroups():
             co_view = True
-            droles = member.getRolesInContext(item)
-            if "ClearanceOfficer" in droles:
-                info = context.getStudentInfo(item)
-                students.append(info)
+##            droles = member.getRolesInContext(item)
+##            if "ClearanceOfficer" in droles:
+##                info = context.getStudentInfo(item)
+##                students.append(info)
         else:
-            info = context.getStudentInfo(item)
-            students.append(info)
+            #info = context.getStudentInfo(item)
+            info = context.students_catalog(id = item) 
+            if len(info) == 1:
+                students.append(info[0])
 
     return context.search_students_form(rendered = rend,

WAeUP_SRP/trunk/skins/waeup_student/search_students_form.pt

@@ -55 +55 @@
               <tr tal:condition="student" 
                   tal:attributes="class python:test(repeat['student'].even(), 'even ajaxtd', 'odd ajaxtd')">
-                <td><a href="id" tal:attributes="href string:${student/student/absolute_url}"
+                <td><a href="id" tal:attributes="href string:${context/portal_url}/campus/students/${student/id}"
                        tal:content="student/id"></a></td>    
                 <td>
                   <span tal:replace="student/name" />
                 </td>    
-                <td><span tal:replace="python: student['app_doc'].jamb_reg_no" /></td>    
+                <td><span tal:replace="student/jamb_reg_no" /></td>    
                 <td tal:condition="options/co_view|nothing">
                        <a href="id" 
@@ -67 +67 @@
                           onclick="javascript:window.open('','edit','width=600, height=700, directories=no, toolbar=no, location=no, menubar=no, scrollbars=yes, status=no, resizable=no, dependent=no')"
                           >[change state]</a></td>
-                <td tal:condition="not: options/co_view|nothing"><span tal:replace="student/review_state" /></td>   
+                <td tal:condition="options/co_view|nothing"><span tal:replace="student/review_state" /></td>   
               </tr>
             </span>