Changeset 2439

Timestamp:

26 Oct 2007, 14:48:39 (17 years ago)

Author:

joachim

Message:

new versions for getLevel

Location:

WAeUP_SRP/base

Files:

• WAeUPTables.py (modified) (2 diffs)
• skins/waeup_student/getLevelSession.py (added)

WAeUP_SRP/base/WAeUPTables.py

@@ -1341 +1341 @@
             data['student_id'] = student_id
             data['level_id'] = level_id
+            session_id = self.getLevelSession(level.getContent(),student_id,level_id)
+            data['session_id'] = session_id 
             #data['queue_status'] = OBJECT_CREATED
             data['code'] = course_id
@@ -1380 +1382 @@
     ###)
 
-    def queue_getCourses(self,student_id,level_id): ###(
-        level_path = "%s/campus/students/%s/study_course/%s" % (self.portal_url.getPortalPath(),
-                                                                student_id,
-                                                                level_id)
-        # portal_catalog_query = Eq('path',level_path) &\
-        #                        Eq('portal_type', "StudentCourseResult")
-        # portal_catalog_results = self.portal_catalog_real.evalAdvancedQuery(portal_catalog_query)
-        portal_catalog_results = self.portal_catalog(path = level_path,
-                                                     portal_type = "StudentCourseResult")
-        query = Eq('student_id',student_id) & Eq('level_id', level_id)
-        course_results = self.course_results.evalAdvancedQuery(query)
-        if len(course_results) != len(portal_catalog_results):
-            course_results = self.updateCourseResults(student_id,
-                                                      level_id,
-                                                      portal_catalog_results,
-                                                      course_results)
-        carry_overs = []
-        normal = []
-        credits = 0
-        for brain in course_results:
-            d = {}
-            credits += int(brain.credits)
-            for field in self.schema():
-                d[field] = getattr(brain,field,'')
-            d['sheduled'] = brain.queue_status == ADDING_SHEDULED
-            d['coe'] = 'Elective'
-            if brain.core_or_elective:
-                d['coe'] = 'Core'
-            id = code = d['id'] = brain.code
-            is_carry_over = False
-            if code.endswith('_co'):
-                is_carry_over = True
-                code = code[:-3]
-            d['code'] = code
-            d['title'] = self.courses_catalog.evalAdvancedQuery(Eq('code',code))[0].title
-            if is_carry_over:
-                d['coe'] = 'Core'
-                carry_overs.append(d)
-            else:
-                normal.append(d)
-        normal.sort(cmp=lambda x,y: cmp(x['semester'], y['semester']))
-        carry_overs.sort(cmp=lambda x,y: cmp(x['semester'], y['semester']))
-        return credits,carry_overs,normal
-    ###)
-
 InitializeClass(CourseResults)
 ###)