Changeset 2033 for WAeUP_SRP/trunk

Timestamp:

18 Jul 2007, 13:44:13 (17 years ago)

Author:

joachim

Message:

add course too registered_courses only for current_level

Location:

WAeUP_SRP/trunk

Files:

• WAeUPTables.py (modified) (2 diffs)
• skins/waeup_student/add_course_result.py (modified) (1 diff)
• skins/waeup_student/create_level.py (modified) (1 diff)
• skins/waeup_student/getStudyLevelInfo.py (modified) (1 diff)
• skins/waeup_utilities/ti_311_resolve.py (added)

WAeUP_SRP/trunk/WAeUPTables.py

@@ -550 +550 @@
             if event_type not in ("sys_add_object","sys_del_object"):
                 return
+            #import pdb;pdb.set_trace()
+            level_session = getattr(object.aq_parent.getContent(),'session','unknown')
+            if level_session not in (self.getSessionId()[-2:],'2006/2007'):
+                return
             course_id = object.getId()
             if course_id.endswith('_co'):
@@ -559 +563 @@
             student_rec = res[0]
             registered_courses = getattr(student_rec,'registered_courses',[])
-            #import pdb;pdb.set_trace()
             try:
                 x = course_id in registered_courses

WAeUP_SRP/trunk/skins/waeup_student/add_course_result.py

@@ -69 +69 @@
 cr.getContent().edit(mapping=d)
 #context.portal_workflow.doActionFor(cr,'close')
-args['course_id'] = course_id
+#args['course_id'] = course_id
 
-logger.info('%s added StudentCourseResult object %s for %s' % (member,course_id,context.getStudentId()))
+logger.info('%s added StudentCourseResult object %s at level %s for %s' % (member,
+                                                                           course_id,
+                                                                           context.getId(),
+                                                                           context.getStudentId()))
 
 psm = "You successfully added course %s!" % course_id

WAeUP_SRP/trunk/skins/waeup_student/create_level.py

@@ -130 +130 @@
         course_result = getattr(level,cr_id)
         context.portal_workflow.doActionFor(course_result,'open')
-        d['core_or_elective'] = getattr(c.getObject().getContent(),'core_or_elective')
+        #d['core_or_elective'] = getattr(c.getObject().getContent(),'core_or_elective')
+        d['core_or_elective'] = True
         course_result.getContent().edit(mapping=d)
         context.waeup_tool.doCommit()

WAeUP_SRP/trunk/skins/waeup_student/getStudyLevelInfo.py

@@ -112 +112 @@
         d = context.getCourseInfo(id)
         d['id'] = id
-        coe = obj.getContent().core_or_elective
+        coe = getattr(obj.getContent(),'core_or_elective',True)
         d['coe'] = 'Core'
         try: