Changeset 2501

Timestamp:

2 Nov 2007, 09:49:14 (17 years ago)

Author:

joachim

Message:

put back in mass_create_course_result

File:

• WAeUP_SRP/base/WAeUPTool.py (modified) (1 diff)

WAeUP_SRP/base/WAeUPTool.py

@@ -1134 +1134 @@
     ###)
 
-    security.declareProtected(ModifyPortalContent,'mass_create_course') ###(
-    def mass_create_course(self,mapping):
+    security.declareProtected(ModifyPortalContent,'mass_create_course_result') ###(
+    def mass_create_course_result(self,mapping):
         #import pdb;pdb.set_trace()
-        if getattr(self,'_v_course_list',None) is None:
-            self._v_course_list = []
-        if getattr(self,'_v_departments',None) is None:
-            res = self.portal_catalog(portal_type = "Department")
-            self._v_department_courses = {}
-            for d in res:
-                self._v_department_courses[d.getId] = getattr(d.getObject(),"courses",None)
-        did = mapping['department_code']
-        d = self._v_department_courses.get(did,None)
-        if d is None:
-            return '', "No Department with ID: %s" % did
+        if getattr(self,'_v_courses',None) is None:
+            res = self.courses_catalog()
+            self._v_courses = {}
+            for brain in res:
+                self._v_courses[brain.code] = brain 
         course_id = mapping.get('code')
-        if course_id in self._v_course_list:
-            return '', "Duplicate Course ID: %s" % did
-        c = getattr(d,course_id,None)
-        if c is not None:
-            return '', "Duplicate Course ID: %s" % did
+        if course_id not in self._v_courses.keys():
+            return '', "No course with ID: %s" % did
+        id_key = ''
+        for id_key in ('student_id','matric_no'):
+            id_field = mapping.get(id_key,None)
+            if id_field is not None:
+                student_id = id_field
+                break
+        query = Eq(id_key,id_field)
+        res = self.students_catalog.evalAdvancedQuery(query)
+        if not res:
+            return '', "No student with %(id_field)s: %(id_key)s" % vars()
+        if id_field != "student_id":
+            mapping['student_id'] = res[0].id
+        mapping['key'] = key = "%(student_id)s|%(level_id)s|%(code)s" % mapping
+        for k in ('semester',):
+            mapping[k] = getattr(self._v_courses[course_id],k)
         try:
-            d.invokeFactory('Course', course_id)
-        except BadRequest,E:
-            return '', "%s" % E
-        self._v_course_list.append(course_id)
-        c = getattr(d,course_id)
-        c.getContent().edit(mapping=mapping)
-        return course_id,''
-    ###)
-
+            self.course_results.addRecord(**mapping)
+        except ValueError:
+            return '', "course result already exists: %s" % key
+        return key,''
+    ###)
 
     security.declareProtected(ModifyPortalContent,'mass_edit_course_result') ###(