Changeset 2988 for WAeUP_SRP/base/skins

Timestamp:

7 Jan 2008, 18:57:27 (17 years ago)

Author:

joachim

Message:

this should work in all cases:

first the normal courses for a level are added, than the
carryover courses are added, which are not already in the level.

File:

• WAeUP_SRP/base/skins/waeup_student/create_level.py (modified) (6 diffs)

WAeUP_SRP/base/skins/waeup_student/create_level.py

@@ -64 +64 @@
     #context.portal_workflow.doActionFor(level,'close_for_edit')
 level_id = level.getId()
-onprobation = context.getContent().previous_verdict in ('C',)
 session_id = context.getLevelSession(level.getContent(),student_id,level_id)
 results = []
@@ -72 +71 @@
 l = []
 
+level_nr,dummy = divmod(int(current_level),100)
+# fetch session courses from the certificate
+res = context.portal_catalog(portal_type="Certificate", id = cert_id)
+if res:
+    cert = res[0]
+    path = cert.getPath()
+    academics_level = 100 * level_nr
+    query = Eq("path","%s/%s" % (path,academics_level)) &\
+            Eq('portal_type','CertificateCourse')
+    courses = aq_portal(query)
+    for c in courses:
+        course_id = "%s" % c.getId
+        if course_id in l:
+            # don't add twice
+            continue
+        l += course_id,
+        d = context.getCourseInfo(c.getId)
+        d['carry_over'] = False
+        d['core_or_elective'] = getattr(c.getObject().getContent(),'core_or_elective')
+        d['course_id'] = course_id
+        d['student_id'] = student_id = context.getStudentId()
+        d['level_id'] = level_id
+        d['session_id'] = session_id
+        records.append(d)
 # fetch carry_over courses from results_import
 if student.session in ('6', '06') and results:
@@ -77 +100 @@
     for co in carry_overs:
         course_id = co.CosCode
-        if level.hasObject(course_id):    #already created
+        if course_id in l:
+            # don't add twice
             continue
+        # if level.hasObject(course_id):    #already created
+        #     continue
         carry_over = False
         query = Eq('code',co.CosCode)
@@ -102 +128 @@
         if not carry_over:
             continue
-        if course_id in l:
-            # don't add twice
-            continue
         l += course_id,
         d = context.getCourseInfo(co.CosCode)
@@ -115 +138 @@
         records.append(d)
 # fetch carry_over courses from the course_results catalog
-elif not onprobation:
+else:
     res = aq_results(Eq('student_id',student_id),
                              sortSpecs=('level_id',))
-    if res:
-        last_level_id = res[-1].level_id
     for result in res:
         course_id = result.code
-        if course_id in l or result.level_id != last_level_id:
+        if course_id in l:
             continue
         query = Eq('code',course_id)
@@ -150 +171 @@
         records.append(d)
 
-# fetch session courses from the certificate
-res = context.portal_catalog(portal_type="Certificate", id = cert_id)
-if res:
-    cert = res[0]
-    path = cert.getPath()
-    academics_level = 100 * (int(current_level)/100)
-    query = Eq("path","%s/%s" % (path,academics_level)) &\
-            Eq('portal_type','CertificateCourse')
-    courses = aq_portal(query)
-    for c in courses:
-        course_id = "%s" % c.getId
-        if course_id in l:
-            # don't add twice
-            continue
-        l += course_id,
-        d = context.getCourseInfo(c.getId)
-        d['carry_over'] = False
-        d['core_or_elective'] = getattr(c.getObject().getContent(),'core_or_elective')
-        d['course_id'] = course_id
-        d['student_id'] = student_id = context.getStudentId()
-        d['level_id'] = level_id
-        d['session_id'] = session_id
-        records.append(d)
 if records:
     context.course_results.addMultipleRecords(records)