Changeset 2040 for WAeUP_SRP

Timestamp:

20 Jul 2007, 11:05:34 (17 years ago)

Author:

joachim

Message:

don't add existing course

File:

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

WAeUP_SRP/trunk/skins/waeup_student/refresh_level.py

@@ -43 +43 @@
 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
 level = context
 #results = context.results_import(matric_no = student.matric_no)
@@ -101 +90 @@
             Eq('portal_type','CertificateCourse')
     courses = aq_portal(query)
-    for c in courses:
+    course_ids = [c.getId  for c in courses if c.getId not in level.objectIds()]
+    for c_id in course_ids:
         #set_trace()
-        if not context.hasObject(c.getId):
-            d = context.getCourseInfo(c.getId)
-            cr_id = level.invokeFactory('StudentCourseResult',c.getId)
-            course_result = getattr(level,cr_id)
-            context.portal_workflow.doActionFor(course_result,'open')
-            d['core_or_elective'] = getattr(c.getObject().getContent(),'core_or_elective')
-            course_result.getContent().edit(mapping=d)
-            context.waeup_tool.doCommit()
+        d = context.getCourseInfo(c_id)
+        cr_id = level.invokeFactory('StudentCourseResult',c_id)
+        course_result = getattr(level,cr_id)
+        context.portal_workflow.doActionFor(course_result,'open')
+        d['core_or_elective'] = getattr(c.getObject().getContent(),'core_or_elective')
+        course_result.getContent().edit(mapping=d)
+        context.waeup_tool.doCommit()
 #session.set('in_progress','finished')
 logger.info('%s updated course list' % member)