Changeset 2454 for WAeUP_SRP/base/skins/waeup_student

Timestamp:

27 Oct 2007, 21:53:04 (17 years ago)

Author:

Henrik Bettermann

Message:

rebuild getNextInfo.py completely
fetch session from portal properties.xml
change all scripts using getSessionId
remove StudentCourseResult? relevant code from event services
make pay_by_sc.py and interswitch_cb.py work (rebuild both)

Location:

WAeUP_SRP/base/skins/waeup_student

Files:

• create_level.py (modified) (2 diffs)
• getNextInfo.py (modified) (2 diffs)
• getStudyLevelInfo.py (modified) (1 diff)

WAeUP_SRP/base/skins/waeup_student/create_level.py

@@ -72 +72 @@
     results = context.results_import(matric_no = student.matric_no)
 records = []
-if results:
-    l = []
+l = []
+if student.session in ('6', '06') and results:
     carry_overs = results
     for co in carry_overs:
@@ -154 +154 @@
 logger.info('%s finished to create level %s' % (student.id,current_level))
 
-if current_session == '05':
-    next_session = '06'
-    next_level = "%s" % (int(current_level) + 100)
-    study_course = getattr(student,'study_course')
-    context.portal_workflow.doActionFor(study_course,'open')
-    study_course_doc = study_course.getContent()
-    study_course_doc.edit(mapping= {'current_level': next_level,
-                                    'current_session': next_session,})
-    context.portal_workflow.doActionFor(study_course,'close_for_edit')
+#if current_session == '05':
+#    next_session = '06'
+#    next_level = "%s" % (int(current_level) + 100)
+#    study_course = getattr(student,'study_course')
+#    context.portal_workflow.doActionFor(study_course,'open')
+#    study_course_doc = study_course.getContent()
+#    study_course_doc.edit(mapping= {'current_level': next_level,
+#                                    'current_session': next_session,})
+#    context.portal_workflow.doActionFor(study_course,'close_for_edit')
 
 return response.redirect("%s/%s" % (context.absolute_url(),current_level))

WAeUP_SRP/base/skins/waeup_student/getNextInfo.py

@@ -1 @@
-## Script (Python) "getSessionId"
+## Script (Python) "getNextInfo"
 ##bind container=container
 ##bind context=context
@@ -12 +12 @@
 return the students next info
 """
+
 info = {}
+
+session_id = student_brain.session
+level_id = student_brain.level
+review_state = student_brain.review_state
+verdict = student_brain.verdict
 info['next_transition'] = None
-session_id = student_brain.session
-if int(session_id) > int(context.getSessionId()[3:4]) -2:
+info['next_session_id'] = next_session_id = session_id
+info['next_level_id'] = next_level_id = level_id
+
+if review_state == 'cleared_and_validated':
     info['next_transition'] = "pay_school_fee"
+elif review_state == 'returning':
+    info['next_level_id'] = "%s" % (int(level_id) + 100)
+    info['next_session_id'] = next_session_id = "%02d" % (int(session_id)+1)
+    if int(session_id) > int(context.getSessionId()[0]) -2:
+        info['next_transition'] = "pay_school_fee"
+        if verdict not in ('A','B',):
+            info['next_level_id'] = level_id
 
-if student_brain.review_state == "returning":
-    session_id info['next_session_id'] = "%02d" % int(session_id) + 1
-info['next_session_str'] = context.session_voc(session_id)
-next_level_id = student_brain.level
-if student_brain.review_state not in ('cleared_and_validated',)
-    next_level_id = "%s" % (int(next_level_id) + 100)
-info['next_level_id'] = next_level_id
-
+info['next_session_str'] = context.sessions_voc(next_session_id)
 
 return info

WAeUP_SRP/base/skins/waeup_student/getStudyLevelInfo.py

@@ -97 +97 @@
 info['credits_exceeded'] = credits_total > 51
 current_session = student.session
-info['submission_allowed']= not info['credits_exceeded'] and current_session == context.getSessionId()[-2:]
+info['submission_allowed']= not info['credits_exceeded'] and current_session == context.getSessionId()[0]
 # carry_overs.sort(cmp_semester_id)
 info['carry_overs'] = carry_overs