Changeset 3367

Timestamp:

21 Mar 2008, 13:29:31 (17 years ago)

Author:

Henrik Bettermann

Message:

do not allow returning students to check admission

Location:

WAeUP_SRP/base

Files:

• Widgets.py (modified) (2 diffs)
• skins/waeup_student/check_admission.py (modified) (1 diff)
• skins/waeup_student/display_session_results.py (deleted)
• skins/waeup_student/display_session_results.py_not_used (added)
• skins/waeup_student/display_session_results_form.pt (deleted)
• skins/waeup_student/display_session_results_form.pt_not_used (added)
• skins/waeup_student/set_access_data.py (modified) (1 diff)

WAeUP_SRP/base/Widgets.py

@@ -798 +798 @@
         elif self.reference == '':
             #s = getStudentByRegNo(self,value)
-            pume = reg_no_catalog(jamb_reg_no = value)
-            if len(pume) < 1:
+            student_record = reg_no_catalog(jamb_reg_no = value)
+            if len(student_record) < 1:
                 err = 'No student record with this registration number'
+            elif self.catalog == "students_catalog" and student_record[0].review_state not in ('student_created','admitted'):
+                err = 'Admission checking not allowed (wrong registration state)'
             else:
-                datastructure['pume'] = pume[0]
+                datastructure['student_record'] = student_record[0]
         elif mode == 'add':
             pass
@@ -2194 +2196 @@
         return info
         ###)
-    
+
     def prepare(self, datastructure, **kw): ###(
         """Prepare datastructure from datamodel."""

WAeUP_SRP/base/skins/waeup_student/check_admission.py

@@ -72 +72 @@
     #    url = "%s/campus/students/%s/pume/admission_rejected_view" % (context.portal_url(),s_id)
     #    return redirect(url)
-    
+
     pw = str(ds.get('app_ac_pin_n'))
     logger.info('%s successfully checked admission and logged in with password %s' % (s_id,pw))

WAeUP_SRP/base/skins/waeup_student/set_access_data.py

@@ -29 +29 @@
         logger.info('Student object with matric_no %s neither exists in students_catalog nor in returning_import' % matric_no)
         return
-res,psm,ds = lt.renderLayout(layout_id= 'student_session_results_search',
+res,psm,ds = lt.renderLayout(layout_id= 'student_firsttime_login',
                       schema_id= 'student_returning',
                       context=context,