Index: /WAeUP_SRP/trunk/skins/waeup_student/create_level.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/create_level.py	(revision 1651)
+++ /WAeUP_SRP/trunk/skins/waeup_student/create_level.py	(revision 1652)
@@ -31,8 +31,9 @@
 current_level = student.level
 in_progress =  request.get('in_progress','not started')
+level_created =  request.get('level_created','xxx')
+create_level =  request.get('create_level',None)
 
-if context.hasObject(current_level):
+if context.hasObject(current_level) and create_level :
     logger.info('%s", level %s already exists' % (student.id,current_level))
-    #response.redirect("%s/%s" % (context.absolute_url(),current_level))
     return
 
@@ -48,11 +49,14 @@
 ##        return
     
-
-context.invokeFactory('StudentStudyLevel',"%s" % current_level)
-level = getattr(context,"%s" % current_level)
-context.portal_workflow.doActionFor(level,'open')
-study_session = context.getSessionString()
-level.getContent().edit(mapping={'session': study_session})
-context.portal_workflow.doActionFor(level,'close_for_edit')
+if level_created == current_level:
+    level = getattr(context,"%s" % current_level)
+else:
+    context.invokeFactory('StudentStudyLevel',"%s" % current_level)
+    level = getattr(context,"%s" % current_level)
+    context.portal_workflow.doActionFor(level,'open')
+    study_session = context.getSessionString()
+    level.getContent().edit(mapping={'session': study_session})
+    context.portal_workflow.doActionFor(level,'close_for_edit')
+    response.redirect("%s?level_created=%s" % (context.absolute_url(),current_level))
 results = context.results_import(matric_no = student.matric_no)
 if results:
@@ -91,21 +95,22 @@
         context.portal_workflow.doActionFor(course_result,'open')
         course_result.getContent().edit(mapping=d)
-res = context.portal_catalog(portal_type="Certificate", id = cert_id)
-l = []
-if res:
-    cert = res[0]
-    path = cert.getPath()
-    query = Eq("path",path) &\
-            Eq('portal_type','CertificateCourse') &\
-            Eq('SearchableText', "%s" % current_level)
-    courses = aq_portal(query)
-    for c in courses:
-        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)
-
+level['create_course_results'](cert_id,current_level)
+##res = context.portal_catalog(portal_type="Certificate", id = cert_id)
+##l = []
+##if res:
+##    cert = res[0]
+##    path = cert.getPath()
+##    #set_trace()
+##    query = Eq("path","%s/%s" % (path,current_level)) &\
+##            Eq('portal_type','CertificateCourse')
+##    courses = aq_portal(query)
+##    for c in courses:
+##        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)
+        
 return response.redirect("%s/%s" % (context.absolute_url(),current_level))
 
