Changeset 2475 for WAeUP_SRP/base

Timestamp:

29 Oct 2007, 18:46:43 (17 years ago)

Author:

Henrik Bettermann

Message:

moves current_verdict to cprevious_verdict after session change
fix06Verdict: moves current_verdict to cprevious_verdict for all students in session 06

Location:

WAeUP_SRP/base/skins

Files:

• waeup_epayment/interswitch_cb.py (modified) (2 diffs)
• waeup_epayment/pay_by_sc.py (modified) (2 diffs)
• waeup_student/getNextInfo.py (modified) (1 diff)
• waeup_student/getStudyCourseInfo.py (modified) (1 diff)
• waeup_student/study_course_view.pt (modified) (1 diff)
• waeup_utilities/fix06Verdict.py (added)

WAeUP_SRP/base/skins/waeup_epayment/interswitch_cb.py

@@ -81 +81 @@
 next_level_id = next_info['next_level_id']
 next_transition = next_info['next_transition']
+next_verdict = next_info['next_verdict']
 
 if  resp == '00':
@@ -91 +92 @@
         except:
             pass
+        verdict = s_brain.verdict
         study_course.getContent().edit(mapping= {'current_level': next_level_id,
-                                                 'current_session': next_session_id,})
+                                                 'current_session': next_session_id,
+                                                 'previous_verdict': verdict,
+                                                 })
         if next_transition:
-            wftool.doActionFor(student,next_transition)    
+            wftool.doActionFor(student,next_transition)
 
     logger.info('%s received valid callback' % student_id)

WAeUP_SRP/base/skins/waeup_epayment/pay_by_sc.py

@@ -43 +43 @@
 next_level_id = next_info['next_level_id']
 next_transition = next_info['next_transition']
+next_verdict = next_info['next_verdict']
 
 validate = request.has_key("cpsdocument_create_button")
@@ -115 +116 @@
         wftool.doActionFor(study_course,'open')
     except:
-        pass    
+        pass
+    verdict = s_brain.verdict    
     study_course.getContent().edit(mapping= {'current_level': next_level_id,
-                                             'current_session': next_session_id,})
+                                             'current_session': next_session_id,
+                                             'current_verdict': next_verdict,
+                                             'previous_verdict': verdict,
+                                             })
     if next_transition:
         wftool.doActionFor(student,next_transition)

WAeUP_SRP/base/skins/waeup_student/getNextInfo.py

@@ -34 +34 @@
 info['next_session_id'] = next_session_id = session_id
 info['next_level_id'] = next_level_id = level_id
+info['next_verdict'] = verdict
 verdicts_voc = context.portal_vocabularies.verdicts
 if review_state == 'cleared_and_validated':
     info['next_transition'] = "pay_school_fee"
+    info['next_verdict'] = ''
 elif review_state == 'returning' and has_verdict and has_level and has_session:
     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"
+        info['next_verdict'] = ''
         if verdict in ('A','B',):
             info['next_level_id'] = "%s" % (int(level_id) + 100)

WAeUP_SRP/base/skins/waeup_student/getStudyCourseInfo.py

@@ -88 +88 @@
 except:
     info['verdict'] = course.current_verdict
+try:
+    info['previous_verdict'] = context.portal_vocabularies.verdicts.get(info['doc'].previous_verdict).upper()
+except:
+    info['previous_verdict'] = course.previous_verdict
 
 return info

WAeUP_SRP/base/skins/waeup_student/study_course_view.pt

@@ -41 +41 @@
         <td><span tal:content="info/verdict" /></td>
       </tr>
+      <tr>
+        <td width="220px">Previous Verdict:</td> 
+        <td><span tal:content="info/previous_verdict" /></td>
+      </tr>      
       <tr>
         <td width="220px">Certificate:</td>