Changeset 2664 for WAeUP_SRP/base/skins/waeup_student/getStudyLevelInfo.py

Timestamp:

15 Nov 2007, 14:35:05 (17 years ago)

Author:

Henrik Bettermann

Message:

fix course registration for returning students

File:

• WAeUP_SRP/base/skins/waeup_student/getStudyLevelInfo.py (modified) (3 diffs)

WAeUP_SRP/base/skins/waeup_student/getStudyLevelInfo.py

@@ -46 +46 @@
 info['is_ca'] = is_ca = context.isCourseAdviser()
 info['student'] = student = context.students_catalog(id=student_id)[0]
-info['review_state'] = review_state = context.getStudentReviewState()
+info['review_state'] = review_state = student.review_state
 info['view_only'] =  review_state != "school_fee_paid"
-info['show_check_boxes'] =  (is_ca and review_state in ('school_fee_paid',)) or\
-                            (is_student and context.getStudentReviewState() == "school_fee_paid") or\
+
+
+has_paid =  review_state == 'school_fee_paid'
+
+info['show_check_boxes'] =  (is_ca and has_paid) or\
+                            (is_student and has_paid) or\
                             (is_so)
+
+
 info['choosen_ids'] = request.get('ids',[])
 info['status_info'] = ""
@@ -77 +83 @@
 info['credits_exceeded'] = credits_total > max_credits
 current_session = student.session
-info['submission_allowed']= not info['credits_exceeded'] and\
-    current_session == context.getSessionId()[0]
+
+info['submission_allowed']= review_state in  ('school_fee_paid','returning') and has_paid
+info['validation_allowed']= review_state == 'courses_registered'
+info['rejection_allowed']= review_state in ('courses_registered', 'courses_validated',)
+
+
 # carry_overs.sort(cmp_semester_id)
 info['carry_overs'] = carry_overs
@@ -86 +96 @@
 info['normal3'] = normal3
 
-info['data_missing'] = not info['normal1'] and not info['normal2'] and not info['normal3'] 
+info['data_missing'] = not info['normal1'] and not info['normal2'] and not info['normal3']
 info['spillover'] = student.level > student.end_level