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

Timestamp:

25 Nov 2007, 18:21:03 (17 years ago)

Author:

Henrik Bettermann

Message:

revised study_level_view and methods

File:

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

WAeUP_SRP/base/skins/waeup_student/getStudyLevelInfo.py

@@ -50 +50 @@
 
 
-has_paid =  review_state == 'school_fee_paid'
+school_fee_paid =  review_state == 'school_fee_paid'
 
-info['show_check_boxes'] =  (is_ca and has_paid) or\
-                            (is_student and has_paid) or\
-                            (is_so)
+is_current_level = level_id == student.level
 
+info['show_check_boxes'] =  (is_ca and school_fee_paid and is_current_level) or\
+                            (is_student and school_fee_paid and is_current_level) or\
+                            (is_so and is_current_level)
+
+info['is_current_level'] = is_current_level
 
 info['choosen_ids'] = request.get('ids',[])
@@ -61 +64 @@
 if is_student:
     if review_state == 'courses_registered':
-        info['status_info'] = "Request for Course Validation pending"
+        info['status_info'] = "Request for course validation pending"
     elif review_state == 'courses_validated':
         info['status_info'] = "Courses validated"
 elif is_ca:
     if review_state == 'courses_registered':
-        info['status_info'] = "Please validate these Courses"
+        info['status_info'] = "Please validate these courses"
     elif review_state == 'courses_validated':
         info['status_info'] = "Courses validated"
-info['doc'] = context.getContent()
+level_doc = info['doc'] = context.getContent()
 cert_id = student.course
 info['cert_id'] = cert_id
@@ -75 +78 @@
     course_results.moveResultsHere(context,student_id)
     logger.info("%s initiated moveResultsHere for %s in level %s" % (member_id,student_id,level_id))
-credits_total,carry_overs,normal1,normal2,normal3 = course_results.getCourses(student_id,level_id)
-info['credits_total'] = credits_total
+total_credits,gpa,carry_overs,normal1,normal2,normal3 = course_results.getCourses(student_id,level_id)
+info['total_credits'] = total_credits
 max_credits = 50
 if context.getId() == student.end_level:
     max_credits = 51
 info['max_credits'] = max_credits
-info['credits_exceeded'] = credits_total > max_credits
+info['credits_exceeded'] = total_credits > max_credits
 current_session = student.session
 
-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',)
+info['gpa'] = gpa
+if gpa and total_credits:
+    info['gpa'] = "%4.2f" % (float(gpa)/int(total_credits))
+    
+info['submission_allowed']= school_fee_paid and level_id == student.level
+info['validation_allowed']= review_state == 'courses_registered' and is_current_level
+info['rejection_allowed']= review_state in ('courses_registered', 'courses_validated',) and is_current_level
 
+info['verdict'] = context.portal_vocabularies.verdicts.get(level_doc.verdict)
+info['session'] = context.portal_vocabularies.sessions.get(level_doc.session)
 
 # carry_overs.sort(cmp_semester_id)