Changeset 1779 for WAeUP_SRP/trunk

Timestamp:

12 May 2007, 16:42:06 (18 years ago)

Author:

Henrik Bettermann

Message:

Three bugs fixed:

1. the verdict key must be stored
2. the field name is current_verdict
3. the if statement sc_review_state != 'content_addable' did not make sense

File:

• WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py

@@ -121 +121 @@
         matric_no = res[0].matric_no
         verdict = res[0].verdict
-        if s_review_state == "returning" and not verdict:
+        if s_review_state in ('returning','school_fee_paid') and not verdict:
             results = context.results_import(matric_no = matric_no)
             if results:
                 study_course = getattr(student,'study_course')
                 sc_review_state = wftool.getInfoFor(study_course,'review_state',None)
+                dsc = {}
+                dsc['current_verdict'] = context.getVerdict(results[0].Verdict)[0]
                 if sc_review_state != 'opened':
                     wftool.doActionFor(study_course,'open')
                 study_course_doc =study_course.getContent()
-                study_course_doc.edit(mapping={'verdict':results[0].Verdict})
-                if sc_review_state != 'opened':
-                    wftool.doActionFor(study_course,'close_for_edit')
+                study_course_doc.edit(mapping = dsc)
+                wftool.doActionFor(study_course,'close_for_edit')
         is_imported = context.returning_import(matric_no = matric_no)
         if s_review_state == "application_pin_entered":
@@ -143 +144 @@
         elif s_review_state == "returning" and is_imported:
             redirect_url = "%s/session_results_view" % student.absolute_url()
+        elif s_review_state in ('school_fee_paid','courses_registered'):
+            redirect_url = "%s/study_course/study_course_view" % student.absolute_url()            
         else:
             redirect_url = "%s/student_index" % student.absolute_url()