Changeset 1657 for WAeUP_SRP/trunk

Timestamp:

28 Mar 2007, 09:43:17 (17 years ago)

Author:

joachim

Message:

fix for #168

File:

• WAeUP_SRP/trunk/skins/waeup_student/refresh_level.py (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_student/refresh_level.py

@@ -40 +40 @@
 cert_id = student.course
 current_level = student.level
-in_progress =  session.get('in_progress','finished')
-if in_progress == 'finished':
-    session.set('in_progress','started')
-    view = context.in_progress_view(refresh=3,page=action_after_validate)
-    response.setHeader('Content-type','text/html; charset=ISO-8859-15')
-    response.setHeader('Content-length','%d' % (len(view)))
-    response.setStatus('OK')
-    response.write(view)
-    response.write('')
-elif in_progress == 'started':
-    return
+##in_progress =  session.get('in_progress','finished')
+##if in_progress == 'finished':
+##    session.set('in_progress','started')
+##    view = context.in_progress_view(refresh=3,page=action_after_validate)
+##    response.setHeader('Content-type','text/html; charset=ISO-8859-15')
+##    response.setHeader('Content-length','%d' % (len(view)))
+##    response.setStatus('OK')
+##    response.write(view)
+##    response.write('')
+##elif in_progress == 'started':
+##    return
 level = context
-results = context.results_import(matric_no = student.matric_no)
+#results = context.results_import(matric_no = student.matric_no)
+results = False #skip carry overs
 if results:
     #carry_overs = [brain for brain in results if brain.GRADE in ('D','E','F')]
@@ -94 +95 @@
     cert = res[0]
     path = cert.getPath()
-    query = Eq("path",path) &\
-            Eq('portal_type','CertificateCourse') &\
-            Eq('SearchableText', "%s" % student.level)
+    query = Eq("path","%s/%s" % (path,student.level)) &\
+            Eq('portal_type','CertificateCourse')
     courses = aq_portal(query)
     for c in courses:
+        #set_trace()
         if not context.hasObject(c.getId):
             d = context.getCourseInfo(c.getId)