Changeset 3057 for WAeUP_SRP

Timestamp:

28 Jan 2008, 15:53:22 (17 years ago)

Author:

joachim

Message:

implemented mass_delete_course_result.
if course-result-data is imported in edit-mode and the filename ends with
"_toDelete.csv" the course-results are deleted.

File:

• WAeUP_SRP/base/WAeUPTool.py (modified) (5 diffs)

WAeUP_SRP/base/WAeUPTool.py

@@ -1595 +1595 @@
     security.declareProtected(ModifyPortalContent,'mass_edit_course_result') ###(
     def mass_edit_course_result(self,mapping):
-        #import pdb;pdb.set_trace()
-        # 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 not in self._v_courses.keys():
-        #     return '', "No course with ID: %s" % did
         id_key = ''
         for id_key in ('student_id','matric_no'):
@@ -1623 +1614 @@
         code = mapping['code']
         mapping['key'] = key = "%(student_id)s|%(level_id)s|%(code)s" % vars()
-        # for k in ('semester',):
-        #     mapping[k] = getattr(self._v_courses[course_id],k)
         try:
             self.course_results.modifyRecord(**mapping)
         except KeyError:
             return '', "No course result to edit: %s" % key
+        return key,''
+    ###)
+
+    security.declareProtected(ModifyPortalContent,'mass_delete_course_result') ###(
+    def mass_delete_course_result(self,mapping):
+        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
+        if not res:
+            return '', "no student with %(id_key)s %(id_field)s" % vars()
+        student_rec = res[0]
+        student_id = student_rec.id
+        level_id = mapping['level_id']
+        code = mapping['code']
+        key = "%(student_id)s|%(level_id)s|%(code)s" % vars()
+        # for k in ('semester',):
+        #     mapping[k] = getattr(self._v_courses[course_id],k)
+        if self.course_results.getRecordByKey(key) is None:
+            return '', "no course-result with %(key)s" % vars()
+        self.course_results.deleteRecord(key)
         return key,''
     ###)
@@ -2036 +2054 @@
         mode = "create"
         if edit:
-            mode = "edit"
+            if filename.endswith('_toDelete'):
+                mode = "delete"
+            else:
+                mode = "edit"
         importer_name = "mass_%(mode)s_%(name)s" % vars()
         importer = getattr(self, '%s' % importer_name,None)
@@ -2111 +2132 @@
                 tr_count += 1
                 total_imported += 1
-                logger.info("%(total_imported)d of %(total)d %(em)s" % vars())
+                logger.info("%(total_imported)d %(mode)sed of %(total)d %(em)s" % vars())
 
             if total and not total % commit_after:
@@ -2135 +2156 @@
             open("%s/import/%s_not_imported%s.csv" % (i_home,filename,current),"a").write(
                                                 '\n'.join(not_imported))
-        em = "Finished import from %s.csv: %d imported, %d not imported (of total %d)" % (filename,total_imported,total_not_imported,total)
+        if mode == 'delete':
+            mode = 'delet'
+        em = "Finished %(mode)sing from %(filename)s.csv: %(total_imported)d %(mode)sed, %(total_not_imported)d not %(mode)sed (of total %(total)d)" % vars()
         logger.info(em)
         return em