Changeset 603 for WAeUP_SRP/trunk/skins/waeup_student

Timestamp:

1 Oct 2006, 10:21:09 (18 years ago)

Author:

Henrik Bettermann

Message:

batch of fixes to open the frontend for the first time

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• application_slip.pt (modified) (1 diff)
• application_view.pt (modified) (1 diff)
• getStudentInfo.py (modified) (1 diff)
• searchStudents.py (modified) (6 diffs)
• student_index.py (modified) (1 diff)
• students_index.py (modified) (1 diff)
• students_manager_view.pt (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_student/application_slip.pt

@@ -6 +6 @@
       </span>
       <span tal:condition="info">
+      
+      <div style="text-align: right">
+       <a href="javascript:window.print('media=screen')">
+         Print Slip</a>
+      </div>
+
+      
         <h3>Post UME Acknowledegement Slip</h3>
         <br />      

WAeUP_SRP/trunk/skins/waeup_student/application_view.pt

@@ -9 +9 @@
             
         <div style="text-align: right">
-        <a href="" target=_blank tal:attributes="href string:application_slip">
+        <a href="" target="slip" tal:attributes="href string:application_slip"
+            onclick="javascript:window.open('','slip','width=600, height=700, directories=no, toolbar=no, location=no, menubar=yes, scrollbars=yes, status=no, resizable=no, dependent=no')">
             <img tal:attributes="src string:${here/portal_url}/actionicon_print.png" />
             Application Slip
         </a>
+        
         </div>
 

WAeUP_SRP/trunk/skins/waeup_student/getStudentInfo.py

@@ -21 +21 @@
 roles = member.getRoles()
 info = {}
-info['is_manager'] = 'Manager' in roles or 'SectionManager' in roles
+info['is_manager'] = context.isManager
 member_id = str(member)
 if student is None:

WAeUP_SRP/trunk/skins/waeup_student/searchStudents.py

@@ -22 +22 @@
 info['wf_states'] = student_wf_states
 info['wf_states'][0] = " ----- "
-mtool = context.portal_membership
-member = mtool.getAuthenticatedMember()
 lt = context.portal_layouts
 pr = context.portal_registration
 path_info = request.get('PATH_INFO').split('/')
-roles = member.getRoles()
-is_manager = 'Manager' in roles or 'SectionManager' in roles
+is_manager = context.isManager
 validate = request.has_key("cpsdocument_edit_button")
 items = []
-default = {'search_mode': 'name', 
-        'review_state': 'admission_applied ', 
+default = {'search_mode': 'name',
+        'review_state': 'created',
         'search_string': ''
         }
-        
+
 rend,psm,ds = lt.renderLayout(layout_id= 'student_search',
                       schema_id= 'student_search',
@@ -57 +54 @@
 with_review = state != "all"
 if not term and not with_review:
-    psm = "You must specify a search string when searching in 'All States'"
+    psm = "You must specify a search string when searching 'all states'."
     err = True
 elif '*' in term:
     psm = "you cannot use the '*' alone"
     err = True
-if err: 
+if err:
     return context.students_manager_view(rendered = rend,
                              psm = psm,
@@ -73 +70 @@
 res = []
 portal_type_query = {'query':['Student','StudentApplication','StudentPersonal']}
-st_queries = ('jamb_id','matric_no','name')
+st_queries = ('jamb_reg_no','matric_no','name')
 onlyreview = with_review and not term
 if onlyreview:
@@ -86 +83 @@
         res = catalog(portal_type='Student',
                       id = term.strip())
-elif what in st_queries: 
-    if what == "jamb_id":
+elif what in st_queries:
+    if what == "jamb_reg_no":
         pt = 'StudentApplication'
         st = "%s*" % term.strip().lower()
@@ -102 +99 @@
         except:
             return context.students_manager_view(rendered = rend,
-                                 psm = 'Searchstring "%s" not allowed' % term,
+                                 psm = 'Search string "%s" not allowed.' % term,
                                  #psm = "%s, %s" % (psm,ds),
                                  students = items,
@@ -117 +114 @@
                                  is_manager = is_manager,
                                  )
-            
+
 if res:
     for r in res:

WAeUP_SRP/trunk/skins/waeup_student/student_index.py

@@ -17 +17 @@
 pm = context.portal_membership
 
-
 if pm.isAnonymousUser():
     return redirect("%s/srp_anonymous_view" % context.absolute_url())
 
-
-member = pm.getAuthenticatedMember()
-roles = member.getRoles()
-isManager = "Manager" in roles or "SectionManager" in roles
-isStudent = "Student" in roles
-
-if isManager:
+if context.isManager():
     return redirect("%s/academics_contents" % context.absolute_url())
-if isStudent:
+if context.isStudent():
     info = context.getStudentInfo()
     student = info['student']

WAeUP_SRP/trunk/skins/waeup_student/students_index.py

@@ -17 +17 @@
 pm = context.portal_membership
 
-
 if pm.isAnonymousUser():
     return redirect("%s/srp_anonymous_view" % context.absolute_url())
 
+campus = context.portal_catalog(meta_type = "University")[-1].getObject()
 
-campus = context.portal_catalog(meta_type = "University")[-1].getObject()
-member = pm.getAuthenticatedMember()
-roles = member.getRoles()
-isManager = "Manager" in roles or "SectionManager" in roles
-isStudent = "Student" in roles
-
-if isManager:
+if context.isManager():
     return redirect("%s/searchStudents" % campus.students.absolute_url())
-if isStudent:
+if context.isStudent():
     info = context.getStudentInfo()
     student = info['student']

WAeUP_SRP/trunk/skins/waeup_student/students_manager_view.pt

@@ -29 +29 @@
         tal:omit-tag=""
         >
+      
+        <h3> Search Student Section</h3>
+        
+        <br />
+      
         <span tal:replace="structure rendered" />
         <tal:block tal:condition="python: batch_info and batch_info['nb_pages'] > 1">